X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;fp=merge.c;h=8d870a22ced90791037d3bfd0d5f33410de09237;hb=c07882446d1f6a830cb4d008bf9d20d3b38a7023;hp=cfe2d97d1c2711bfbb74d79eeba4b2d37f498c0f;hpb=8bb45b1dfe6b5b30d89f154c16fb3eb8c049f496;p=onak.git

diff --git a/merge.c b/merge.c
index cfe2d97..8d870a2 100644
--- a/merge.c
+++ b/merge.c
@@ -394,9 +394,9 @@ int update_keys(struct openpgp_publickey **keys, bool verbose)
 					*keys = curkey->next;
 				} else {
 					prev->next = curkey->next;
-					prev = curkey->next;
 					curkey->next = NULL;
 					free_publickey(curkey);
+					curkey = prev;
 				}
 			} else {
 				prev = curkey;