[git] GnuPG - branch, master, updated. gnupg-2.1.1-48-g6eebc56

by Werner Koch cvs at cvs.gnupg.org
Tue Jan 27 09:12:45 CET 2015


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  6eebc56687935f3e993eac374b9f4cc5ad3bcf2b (commit)
      from  9453d645d4a489f038829c80343c124fff62d635 (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 6eebc56687935f3e993eac374b9f4cc5ad3bcf2b
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 27 09:11:13 2015 +0100

    gpg: Fix segv introduced to commit 4d7c9b0.
    
    * g10/keygen.c (get_parameter_passphrase): Take care of R == NULL.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keygen.c b/g10/keygen.c
index 6143269..50fb67d 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2826,7 +2826,7 @@ static const char *
 get_parameter_passphrase (struct para_data_s *para)
 {
   struct para_data_s *r = get_parameter (para, pPASSPHRASE);
-  return r->u.value;
+  return r ? r->u.value : NULL;
 }
 
 

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

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


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




More information about the Gnupg-commits mailing list