[svn] GnuPG - r4037 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-03-07 00:14:13 +0100 (Tue, 07 Mar 2006)
New Revision: 4037

Modified:
   trunk/g10/ChangeLog
   trunk/g10/mainproc.c
Log:
* mainproc.c (proc_compressed): "Uncompressed" is not a valid compression
algorithm.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-03-06 21:28:25 UTC (rev 4036)
+++ trunk/g10/ChangeLog	2006-03-06 23:14:13 UTC (rev 4037)
@@ -1,3 +1,8 @@
+2006-03-06  David Shaw  <dshaw at jabberwocky.com>
+
+	* mainproc.c (proc_compressed): "Uncompressed" is not a valid
+	compression algorithm.
+
 2006-03-06  Werner Koch  <wk at g10code.com>
 
 	* mainproc.c (check_sig_and_print): Made the composition test more

Modified: trunk/g10/mainproc.c
===================================================================
--- trunk/g10/mainproc.c	2006-03-06 21:28:25 UTC (rev 4036)
+++ trunk/g10/mainproc.c	2006-03-06 23:14:13 UTC (rev 4037)
@@ -748,7 +748,9 @@
     int rc;
 
     /*printf("zip: compressed data packet\n");*/
-    if( c->sigs_only )
+    if( !zd->algorithm )
+      rc=G10ERR_COMPR_ALGO;
+    else if( c->sigs_only )
 	rc = handle_compressed( c, zd, proc_compressed_cb, c );
     else if( c->encrypt_only )
 	rc = handle_compressed( c, zd, proc_encrypt_cb, c );