[git] GnuPG - branch, master, updated. gnupg-2.1.10-61-gaecf1a3

[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  aecf1a3c57ca8bf8050a3743b62fe142ccf9eb22 (commit)
      from  5c759924fb92b6de7ab3baed7871e5114ebd2505 (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 aecf1a3c57ca8bf8050a3743b62fe142ccf9eb22
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Dec 23 16:55:00 2015 +0900

    scd: Fix commit b30c15bf (again).
    
    * g10/keygen.c (do_generate_keypair): Clear the variable S.
    
    --
    
    GnuPG-bug-id: 2201

diff --git a/g10/keygen.c b/g10/keygen.c
index 8bb7906..03fc53c 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4104,6 +4104,7 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
   if (!err && get_parameter (para, pSUBKEYTYPE))
     {
       sub_psk = NULL;
+      s = NULL;
       if (!card || (s = get_parameter_value (para, pCARDBACKUPKEY)))
         {
           err = do_create (get_parameter_algo (para, pSUBKEYTYPE, NULL),

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

Summary of changes:
 g10/keygen.c | 1 +
 1 file changed, 1 insertion(+)


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