[Pkg-gnupg-commit] [gnupg2] 64/159: gpg: Add standard free() semantic to pubkey_free.

[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 04c9cddda95f2a8ca5c0cf10bb3dd6accf56cf45
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Dec 23 15:17:50 2015 +0100

    gpg: Add standard free() semantic to pubkey_free.
    
    * g10/getkey.c (pubkey_free): Check for NULL arg.
    --
    
    We don't like surprises ;-)
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/getkey.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/g10/getkey.c b/g10/getkey.c
index a32e729..26b1932 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -369,9 +369,12 @@ getkey_disable_caches ()
 void
 pubkey_free (struct pubkey *key)
 {
-  xfree (key->pk);
-  release_kbnode (key->keyblock);
-  xfree (key);
+  if (key)
+    {
+      xfree (key->pk);
+      release_kbnode (key->keyblock);
+      xfree (key);
+    }
 }
 
 void

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