[git] GnuPG - branch, master, updated. gnupg-2.1.10-75-g575c15a

[by Neal H. Walfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  575c15a090913d86cf8d75b2bc4471e371f234b9 (commit)
       via  bf694cbc68cc7dfc0ce16bbe389014f8e8ee0d87 (commit)
      from  79b51bb8727bd3485229ac8ff5987558156d5d83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 575c15a090913d86cf8d75b2bc4471e371f234b9
Author: Neal H. Walfield <neal at g10code.com>
Date:   Mon Jan 4 12:46:11 2016 +0100

    gpg: Fix double free.
    
    * g10/getkey.c (get_pubkeys): Fix double free.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    Fixes-commit: 7195b943
    
    Note: this error is not a security problem, because this code path is
    currently never executed.

diff --git a/g10/getkey.c b/g10/getkey.c
index 52e3d23..86a3c80 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -629,15 +629,7 @@ get_pubkeys (ctrl_t ctrl,
 
  out:
   if (err)
-    {
-      while ((r = results))
-        {
-          results = results->next;
-          pubkey_free (r);
-          release_kbnode (r->keyblock);
-          xfree (r);
-        }
-    }
+    pubkeys_free (results);
   else
     *r_keys = results;
 

commit bf694cbc68cc7dfc0ce16bbe389014f8e8ee0d87
Author: Neal H. Walfield <neal at g10code.com>
Date:   Mon Jan 4 12:41:21 2016 +0100

    Revert commit 4654384fe7a4dcee113dacf27c398b13dea5d0be.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    
    Werner pointed out that a special error message is not needed: the
    error code (as displayed by gpg_strerror) will indicate what went
    wrong.

diff --git a/g10/getkey.c b/g10/getkey.c
index 608b75e..52e3d23 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1452,7 +1452,7 @@ parse_def_secret_key (ctrl_t ctrl)
       err = classify_user_id (t->d, &desc, 1);
       if (err)
         {
-          log_error (_("error parsing search description \"%s\": %s\n"),
+          log_error (_("secret key \"%s\" not found: %s\n"),
                      t->d, gpg_strerror (err));
           if (!opt.quiet)
             log_info (_("(check argument of option '%s')\n"), "--default-key");

-----------------------------------------------------------------------

Summary of changes:
 g10/getkey.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org