[Pkg-gnupg-commit] [gnupg2] 45/241: gpg: Don't accidentally free UTK_LIST.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 8c3b7915d675ca5346c17244654d5c6ab583ac44
Author: Neal H. Walfield <neal at g10code.com>
Date:   Wed Oct 21 13:36:12 2015 +0200

    gpg: Don't accidentally free UTK_LIST.
    
    * g10/trustdb.c (validate_keys): Don't free UTK_LIST.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/trustdb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/g10/trustdb.c b/g10/trustdb.c
index 022131a..e2f1935 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -2097,7 +2097,8 @@ validate_keys (int interactive)
  leave:
   keydb_release (kdb);
   release_key_array (keys);
-  release_key_items (klist);
+  if (klist != utk_list)
+    release_key_items (klist);
   release_key_hash_table (full_trust);
   release_key_hash_table (used);
   release_key_hash_table (stored);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git