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

+Mon Dec 27 01:09:20 CET 2004 (tk)

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

+  * libclamav/scanners.c: Add missing ArchiveBlockMax rule for recursion limit

+			  (reported by HR <haavard*zyf.no-ip.org>)

+

 Wed Dec 22 16:08:49 GMT 2004 (trog)

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

   * sigtool/vba.c: Add some more Word6 tokens.

@@ -1181,7 +1181,10 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

     if(SCAN_ARCHIVE && limits && limits->maxreclevel)

 	if(*arec > limits->maxreclevel) {

 	    cli_dbgmsg("Archive recursion limit exceeded (arec == %d).\n", *arec);

-	    /* return CL_EMAXREC; */

+	    if(BLOCKMAX) {

+		*virname = "Archive.ExceededRecursionLimit";

+		return CL_VIRUS;

+	    }

 	    return CL_CLEAN;

 	}