37 lines
936 B
Diff
37 lines
936 B
Diff
|
From a861f9343d6e6d18064e4e54aeb914c5a10b2095 Mon Sep 17 00:00:00 2001
|
||
|
|
From: NIIBE Yutaka <gniibe@fsij.org>
|
||
|
|
Date: Wed, 17 Apr 2019 09:58:07 +0900
|
||
|
|
Subject: [PATCH] g10: Fix a memory leak.
|
||
|
|
|
||
|
|
* g10/import.c (import): Care PNDING_PKT on error.
|
||
|
|
|
||
|
|
--
|
||
|
|
|
||
|
|
GnuPG-bug-id: 4461
|
||
|
|
Reported-by: Philippe Antoine
|
||
|
|
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||
|
|
---
|
||
|
|
g10/import.c | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/g10/import.c b/g10/import.c
|
||
|
|
index 565086773..00bc47cc1 100644
|
||
|
|
--- a/g10/import.c
|
||
|
|
+++ b/g10/import.c
|
||
|
|
@@ -689,6 +689,13 @@ import (ctrl_t ctrl, IOBUF inp, const char* fname,struct import_stats_s *stats,
|
||
|
|
log_error (_("error reading '%s': %s\n"), fname, gpg_strerror (rc));
|
||
|
|
|
||
|
|
release_kbnode (secattic);
|
||
|
|
+
|
||
|
|
+ /* When read_block loop was stopped by error, we have PENDING_PKT left. */
|
||
|
|
+ if (pending_pkt)
|
||
|
|
+ {
|
||
|
|
+ free_packet (pending_pkt, NULL);
|
||
|
|
+ xfree (pending_pkt);
|
||
|
|
+ }
|
||
|
|
return rc;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.11.0
|