From 956f85c7e489b6be728f5f9b2ba9bd3e0dcf37a6 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Fri, 7 Sep 2018 13:01:52 +0900
Subject: [PATCH] g10: Fix memory leak.

* g10/import.c (read_block): Call free_packet to skip the packet.

--

Cherry-pick of master commit of:
	7c96cc67e108f3a9514a4222ffac2f9f9a2ab19e

Reported-by: Philippe Antoine
GnuPG-bug-id: 3916
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit 91f8a9b33a1282cbf00cb4b71b177088f0d923d7)

Gbp-Pq: Name g10-Fix-memory-leak.patch
---
 g10/import.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/g10/import.c b/g10/import.c
index d7d7974..80bf7c6 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -924,6 +924,8 @@ read_block( IOBUF a, int with_meta,
                 add_kbnode (root, new_kbnode (pkt));
               pkt = xmalloc (sizeof *pkt);
             }
+          else
+            free_packet (pkt, &parsectx);
           init_packet(pkt);
           break;
         }
-- 
2.30.2