Limit fix

git-svn: trunk@115

clamav-devel/ChangeLog

@@ -1,3 +1,8 @@
+Sun Nov 16 02:34:12 CET 2003 (tk)
+---------------------------------
+  * libclamav, clamd: fixed limit initialization when ScanArchive is disabled
+		      (thanks to Igor Brezac <igor*ipass.net>)
+
 Sat Nov 15 03:54:39 CET 2003 (tk)
 ---------------------------------
   * sigtool: fixed --build problems introduced in 0.65

clamav-devel/clamd/server.c

@@ -402,6 +402,7 @@ int acceptloop(int socketd, struct cl_node *root, const struct cfgstruct *copt)
     if(cfgopt(copt, "ScanArchive") || cfgopt(copt, "ClamukoScanArchive")) {
 
 	/* set up limits */
+	memset(&limits, 0, sizeof(struct cl_limits));
 
 	if((cpt = cfgopt(copt, "ArchiveMaxFileSize"))) {
 	    if((limits.maxfilesize = cpt->numarg))

clamav-devel/libclamav/scanners.c

@@ -642,7 +642,7 @@ int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct
     if(SCAN_ARCHIVE || SCAN_MAIL) {
         /* Need to examine file type */
 
-	if(limits && limits->maxreclevel)
+	if(SCAN_ARCHIVE && limits && limits->maxreclevel)
 	    if(*reclev > limits->maxreclevel)
 		return CL_EMAXREC;