From: Jonathan McDowell <noodles@earth.li>
Date: Sun, 18 Aug 2019 10:03:47 +0000 (+0100)
Subject: Fix memory leak when merging key signatures
X-Git-Tag: onak-0.6.0~35
X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=commitdiff_plain;h=5e2c81ee4acb5bf3eb4afdbc766646ba06f96dd9

Fix memory leak when merging key signatures

This is a long-standing memory leak when merging signed packet lists. It
hasn't been observed in the wild because the key merging is normally
done in a transient process. Found using GCC with -fsanitize=leak
---

diff --git a/merge.c b/merge.c
index 305c60a..9d03411 100644
--- a/merge.c
+++ b/merge.c
@@ -163,17 +163,15 @@ struct openpgp_signedpacket_list *find_signed_packet(
  *	removes it if found. Assumes the packet can only exist a maximum of
  *	once in the list.
  */
-bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
+static void remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
 		struct openpgp_signedpacket_list **list_end,
 		struct openpgp_packet *packet)
 {
 	struct openpgp_signedpacket_list *cur = NULL;
 	struct openpgp_signedpacket_list *prev = NULL;
-	bool found = false;
 
-	for (cur = *packet_list; !found && (cur != NULL); cur = cur->next) {
+	for (cur = *packet_list; cur != NULL; cur = cur->next) {
 		if (compare_packets(cur->packet, packet) == 0) {
-			found = true;
 			if (prev == NULL) {
 				*packet_list = cur->next;
 			} else {
@@ -182,14 +180,14 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
 			if (cur->next == NULL) {
 				*list_end = prev;
 			}
-			/*
-			 * TODO: Free the removed signed packet...
-			 */
+			cur->next = NULL;
+			free_signedpacket_list(cur);
+			break;
 		}
 		prev = cur;
 	}
 
-	return found;
+	return;
 }
 
 /**