@@ -1,3 +1,8 @@

+Wed Nov 16 18:47:31 CET 2005 (tk)

+---------------------------------

+  * libclamav/zziplib: improve handling of incorrectly created/handcrafted zip

+		       archives. Test file provided by Christoph Cordes

+

 Tue Nov 15 21:55:25 CET 2005 (tk)

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

   * libclamav/zziplib: improve handling of multi-part/broken zip archives

@@ -429,6 +429,13 @@ __zzip_parse_root_directory(int fd,

                 return ZZIP_DIR_READ;

         }

         hdr->d_compr = (uint8_t)ZZIP_GET16(d->z_compr);

+

+	if(!hdr->d_compr && hdr->d_csize != hdr->d_usize) {

+	    cli_dbgmsg("Zziplib: File claims to be stored but csize != usize\n");

+	    cli_dbgmsg("Zziplib: Switching to the inflate method\n");

+	    hdr->d_compr = 8;

+	}

+

 	hdr->d_flags = u_flags;

         /* bull: hdr->d_compr is uint8_t