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

+Tue Jul 26 03:31:12 CEST 2005 (tk)

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

+  * libclamav: add support for Zip SFX unpacking (patch by Sven Strickroth

+	       <sven*clamav.net>)

+

 Tue Jul 26 02:54:18 CEST 2005 (tk)

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

   * configure.in: --disable-cr was not working properly, reported by Stephane

@@ -170,6 +170,7 @@ static const struct cli_smagic_s cli_smagic[] = {

     {"3c494652414d45", "HTML data", CL_TYPE_HTML},      /* <IFRAME */

     {"526172211a0700", "RAR-SFX", CL_TYPE_RARSFX},

+    {"504b03041400", "ZIP-SFX", CL_TYPE_ZIPSFX},

     {NULL,  NULL,   CL_TYPE_UNKNOWN_DATA}

 };

@@ -48,6 +48,7 @@ typedef enum {

     /* bigger numbers have higher priority (in o-t-f detection) */

     CL_TYPE_HTML, /* on the fly */

     CL_TYPE_MAIL,  /* magic + on the fly */

+    CL_TYPE_ZIPSFX, /* on the fly */

     CL_TYPE_RARSFX /* on the fly */

 } cli_file_t;

@@ -262,7 +262,7 @@ static int cli_scanrar(int desc, const char **virname, long int *scanned, const

 }

 #ifdef HAVE_ZLIB_H

-static int cli_scanzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec)

+static int cli_scanzip(int desc, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, unsigned int options, unsigned int arec, unsigned int mrec, unsigned long int offset)

 {

 	ZZIP_DIR *zdir;

 	ZZIP_DIRENT zdirent;

@@ -280,6 +280,9 @@ static int cli_scanzip(int desc, const char **virname, long int *scanned, const

     cli_dbgmsg("in scanzip()\n");

+    if(offset)

+	lseek(desc, offset, SEEK_SET);

+

     if((zdir = zzip_dir_fdopen(dup(desc), &err)) == NULL) {

 	cli_dbgmsg("Zip: Not supported file format ?.\n");

 	cli_dbgmsg("Zip: zzip_dir_fdopen() return code: %d\n", err);

@@ -1443,7 +1446,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	case CL_TYPE_ZIP:

 	    if(SCAN_ARCHIVE)

-		ret = cli_scanzip(desc, virname, scanned, root, limits, options, arec, mrec);

+		ret = cli_scanzip(desc, virname, scanned, root, limits, options, arec, mrec, 0);

 	    break;

 	case CL_TYPE_GZ:

@@ -1584,6 +1587,13 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 			if(cli_scanrar(desc, virname, scanned, root, limits, options, arec, mrec, ftoffset) == CL_VIRUS)

 			    return CL_VIRUS;

 		    break;

+

+		case CL_TYPE_ZIPSFX:

+		    if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE)

+			cli_dbgmsg("ZIP-SFX found at %d\n", ftoffset);

+			if(cli_scanzip(desc, virname, scanned, root, limits, options, arec, mrec, ftoffset) == CL_VIRUS)

+			    return CL_VIRUS;

+		    break;

 	    }

 	    nret == CL_TYPE_MAIL ? mrec-- : arec--;

 	}