@@ -1,3 +1,7 @@

+Tue Oct 27 11:59:32 CET 2009 (tk)

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

+ * libclamav/scanners.c: drop hardcoded offset limits for embedded objs (bb#1664)

+

 Mon Oct 26 16:09:29 CET 2009 (tk)

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

  * libclamav/others.c: call srand() already in cli_init() (bb#1728)

@@ -1757,27 +1757,27 @@ static int cli_scanraw(int desc, cli_ctx *ctx, cli_file_t type, uint8_t typercg,

 		if(fpt->offset) switch(fpt->type) {

 		    case CL_TYPE_RARSFX:

 			    cli_dbgmsg("RAR/RAR-SFX signature found at %u\n", (unsigned int) fpt->offset);

-			if(type != CL_TYPE_RAR && have_rar && SCAN_ARCHIVE && fpt->offset < 102400 && (DCONF_ARCH & ARCH_CONF_RAR)) {

+			if(type != CL_TYPE_RAR && have_rar && SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_RAR)) {

 			    cli_dbgmsg("RAR/RAR-SFX signature found at %u\n", (unsigned int) fpt->offset);

 			    nret = cli_scanrar(desc, ctx, fpt->offset, &lastrar);

 			}

 			break;

 		    case CL_TYPE_ZIPSFX:

-			if(type != CL_TYPE_ZIP && SCAN_ARCHIVE && fpt->offset < 102400 && (DCONF_ARCH & ARCH_CONF_ZIP)) {

+			if(type != CL_TYPE_ZIP && SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_ZIP)) {

 			    cli_dbgmsg("ZIP/ZIP-SFX signature found at %u\n", (unsigned int) fpt->offset);

 			    nret = cli_unzip_single(desc, ctx, fpt->offset);

 			}

 			break;

 		    case CL_TYPE_CABSFX:

-			if(type != CL_TYPE_MSCAB && SCAN_ARCHIVE && fpt->offset < 102400 && (DCONF_ARCH & ARCH_CONF_CAB)) {

+			if(type != CL_TYPE_MSCAB && SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_CAB)) {

 			    cli_dbgmsg("CAB/CAB-SFX signature found at %u\n", (unsigned int) fpt->offset);

 			    nret = cli_scanmscab(desc, ctx, fpt->offset);

 			}

 			break;

 		    case CL_TYPE_ARJSFX:

-			if(type != CL_TYPE_ARJ && SCAN_ARCHIVE && fpt->offset < 102400 && (DCONF_ARCH & ARCH_CONF_ARJ)) {

+			if(type != CL_TYPE_ARJ && SCAN_ARCHIVE && (DCONF_ARCH & ARCH_CONF_ARJ)) {

 			    cli_dbgmsg("ARJ-SFX signature found at %u\n", (unsigned int) fpt->offset);

 			    nret = cli_scanarj(desc, ctx, fpt->offset, &lastrar);

 			}