update

git-svn: trunk@1991

clamav-devel/ChangeLog

@@ -1,3 +1,8 @@
+Sat May 27 13:50:42 CEST 2006 (tk)
+----------------------------------
+  * libclamav/scanners.c: fix logic bug in new code
+			  Reported by aCaB and Sven
+
 Wed May 24 14:04:56 CEST 2006 (acab)
 ------------------------------------
   * libclamav/upx.c: Fixed macro typo reported by Andy Fiddaman.

clamav-devel/libclamav/scanners.c

@@ -428,8 +428,8 @@ static int cli_scanzip(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c
 		if(!swarning) {
 		    cli_warnmsg("Not supported compression method in one or more files\n");
 		    swarning = 1;
-		    continue;
 		}
+		continue;
 	    } else {
 		cli_dbgmsg("Zip: Can't open file %s\n", zdirent.d_name);
 		ret = CL_EZIP;

clamav-devel/libclamav/unzip.c

@@ -343,11 +343,18 @@ int zip_dir_read(zip_dir *dir, zip_dirent *d)
 
 int zip_file_close(zip_file *fp)
 {
-	zip_dir *dir = fp->dir;
+	zip_dir *dir;
+
+
+    if(!fp) {
+	cli_errmsg("Unzip: zip_file_close: fp == NULL\n");
+	return CL_ENULLARG;
+    }
 
     if(fp->method)
         inflateEnd(&fp->d_stream);
 
+    dir = fp->dir;
     if(fp->buf32k) {
         if(!dir->cache.buf32k)
 	    dir->cache.buf32k = fp->buf32k;