@@ -1,7 +1,13 @@

+Sun Feb 18 15:03:37 CET 2007 (tk)

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

+  * libclamav/unzip.c: handle some deflate64 compressed files

+

 Sat Feb 17 11:20:17 CET 2007 (edwin)

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

   * libclamav/entconv.c: Don't normalize buffer shorter than 2 bytes.

 Sat Feb 17 11:20:17 CET 2007 (edwin)

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

   * libclamav/rtf.c: Fix possible memory leak, and add more sanity checks.

 Sat Feb 17 02:34:17 CET 2007 (acab)

@@ -480,6 +480,7 @@ zip_file *zip_file_open(zip_dir *dir, const char *name, int d_off)

 	    switch (hdr->d_compr) {

 		case ZIP_METHOD_STORED:

 		case ZIP_METHOD_DEFLATED:

+		case ZIP_METHOD_DEFLATED64:

 		    break;

 		case ZIP_METHOD_SHRUNK:

@@ -489,7 +490,6 @@ zip_file *zip_file_open(zip_dir *dir, const char *name, int d_off)

 		case ZIP_METHOD_REDUCEDx4:

 		case ZIP_METHOD_IMPLODED:

 		case ZIP_METHOD_TOKENIZED:

-		case ZIP_METHOD_DEFLATED64:

 		case ZIP_METHOD_IMPLODED_DCL:

 		case ZIP_METHOD_BZIP2:

 		case ZIP_METHOD_AES:

@@ -613,6 +613,7 @@ ssize_t zip_file_read(zip_file *fp, char *buf, size_t len)

 	    return bread;

 	case ZIP_METHOD_DEFLATED:

+	case ZIP_METHOD_DEFLATED64:

 	    fp->d_stream.avail_out = l;

 	    fp->d_stream.next_out = (unsigned char *) buf;

 	    do {

@@ -641,7 +642,12 @@ ssize_t zip_file_read(zip_file *fp, char *buf, size_t len)

 		    if(ret == Z_OK) {

 			fp->restlen -= (fp->d_stream.total_out - startlen);

 		    } else {

-			dir->errcode = CL_EZIP;

+			if(fp->method == ZIP_METHOD_DEFLATED64) {

+			    cli_dbgmsg("Unzip: zip_file_read: Not supported compression method (%u)\n", fp->method);

+			    dir->errcode = CL_ESUPPORT;

+			} else {

+			    dir->errcode = CL_EZIP;

+			}

 			return -1;

 		    }

 		}