[git] GnuPG - branch, master, updated. gnupg-2.1.15-260-g693e657

[by NIIBE Yutaka]

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  693e657ff04756737dce025203c0deba480ea8de (commit)
      from  dafce6f698bec6e9d4c0125b90754d0687294e86 (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 693e657ff04756737dce025203c0deba480ea8de
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 21 16:27:46 2016 +0900

    scd: Fix segfault changing key attr.
    
    * asc/app-openpgp.c (change_keyattr_from_string): Release after
    allocated.
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 0931095..f909c6f 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2987,7 +2987,6 @@ change_keyattr_from_string (app_t app,
       size_t oid_len;
 
       oidstr = openpgp_curve_to_oid (string+n, NULL);
-      gcry_mpi_release (oid);
       if (!oidstr)
         {
           err = gpg_error (GPG_ERR_INV_DATA);
@@ -3005,6 +3004,7 @@ change_keyattr_from_string (app_t app,
       string[0] = algo;
       memcpy (string+1, oidbuf+1, oid_len-1);
       err = change_keyattr (app, keyno, string, oid_len, pincb, pincb_arg);
+      gcry_mpi_release (oid);
     }
   else
     err = gpg_error (GPG_ERR_PUBKEY_ALGO);

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

Summary of changes:
 scd/app-openpgp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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