[svn] GnuPG - r4416 - trunk/g10

[svn author wk]

Author: wk
Date: 2007-01-31 16:22:21 +0100 (Wed, 31 Jan 2007)
New Revision: 4416

Modified:
   trunk/g10/ChangeLog
   trunk/g10/verify.c
Log:
Fix NULL pointer dereference


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2007-01-31 15:06:16 UTC (rev 4415)
+++ trunk/g10/ChangeLog	2007-01-31 15:22:21 UTC (rev 4416)
@@ -1,5 +1,7 @@
 2007-01-31  Werner Koch  <wk at g10code.com>
 
+	* verify.c (verify_signatures): Do no dereference a NULL afx.
+
 	* passphrase.c (passphrase_get): Set the cancel flag on all error
 	from the agent.  Fixes a bug reported by Tom Duerbusch.
 

Modified: trunk/g10/verify.c
===================================================================
--- trunk/g10/verify.c	2007-01-31 15:06:16 UTC (rev 4415)
+++ trunk/g10/verify.c	2007-01-31 15:22:21 UTC (rev 4416)
@@ -115,7 +115,7 @@
     rc = proc_signature_packets( NULL, fp, sl, sigfile );
     free_strlist(sl);
     iobuf_close(fp);
-    if( (afx->no_openpgp_data && rc == -1) || rc == G10ERR_NO_DATA ) {
+    if( (afx && afx->no_openpgp_data && rc == -1) || rc == G10ERR_NO_DATA ) {
 	log_error(_("the signature could not be verified.\n"
 		   "Please remember that the signature file (.sig or .asc)\n"
 		   "should be the first file given on the command line.\n") );