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

+Fri Apr  3 13:05:44 CEST 2009 (acab)

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

+ * shared/optparser.c, docs: limit options expressing sizes to

+			     32bit (bb#1508)

+

 Fri Apr  3 11:32:33 EEST 2009 (edwin)

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

  * unit_tests/check_clamd.sh: properly remove old logfiles during

@@ -397,6 +397,9 @@ Default: no

 Ignore files larger than SIZE.

 .br 

 Default: 5M

+.SH "NOTES"

+.LP 

+All options expressing a size are limited to max 4GB. Values in excess will be resetted to the maximum.

 .SH "FILES"

 .LP 

 @CFGDIR@/clamd.conf

@@ -142,10 +142,10 @@ If an email contains URLs ClamAV can download and scan them. \fBWARNING: This op

 Extract at most #n files from each scanned file (when this is an archive, a document or another kind of container). This option protects your system against DoS attacks (default: 10000)

 .TP 

 \fB\-\-max\-filesize=#n\fR

-Extract and scan at most #n kilobytes from each archive. You may pass the value in megabytes in format xM or xm, where x is a number. This option protects your system against DoS attacks (default: 25 MB)

+Extract and scan at most #n kilobytes from each archive. You may pass the value in megabytes in format xM or xm, where x is a number. This option protects your system against DoS attacks (default: 25 MB, max: <4 GB)

 .TP 

 \fB\-\-max\-scansize=#n\fR

-Extract and scan at most #n kilobytes from each scanned file. You may pass the value in megabytes in format xM or xm, where x is a number. This option protects your system against DoS attacks (default: 100 MB)

+Extract and scan at most #n kilobytes from each scanned file. You may pass the value in megabytes in format xM or xm, where x is a number. This option protects your system against DoS attacks (default: 100 MB, max: <4 GB)

 .TP 

 \fB\-\-max\-recursion=#n\fR

 Set archive recursion level limit. This option protects your system against DoS attacks (default: 16).

@@ -32,6 +32,7 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

+#include <errno.h>

 #ifdef HAVE_STRINGS_H

 #include <strings.h>

 #endif

@@ -635,6 +636,7 @@ struct optstruct *optparse(const char *cfgfile, int argc, char **argv, int verbo

 	struct option longopts[MAXCMDOPTS];

 	char shortopts[MAXCMDOPTS];

 	regex_t regex;

+	unsigned long int lnumarg;

     if(oldopts)

@@ -898,27 +900,55 @@ struct optstruct *optparse(const char *cfgfile, int argc, char **argv, int verbo

 		break;

 	    case TYPE_SIZE:

-		if(sscanf(arg, "%d", &numarg) != 1) {

+		errno = 0;

+		lnumarg = strtoul(arg, &buff, 0);

+		if(errno != ERANGE) {

+		    switch(*buff) {

+		    case 'M':

+		    case 'm':

+			printf("%u\n", UINT_MAX/(1024*1024));

+			if(lnumarg <= UINT_MAX/(1024*1024)) lnumarg *= 1024*1024;

+			else errno = ERANGE;

+			break;

+		    case 'K':

+		    case 'k':

+			if(lnumarg <= UINT_MAX/1024) lnumarg *= 1024;

+			else errno = ERANGE;

+			break;

+		    case '\0':

+			break;

+		    default:

+			if(cfgfile) {

+			    fprintf(stderr, "ERROR: Can't parse numerical argument for option %s\n", name);

+			} else {

+			    if(optentry->shortopt)

+				fprintf(stderr, "ERROR: Can't parse numerical argument for option --%s (-%c)\n", optentry->longopt, optentry->shortopt);

+			    else

+				fprintf(stderr, "ERROR: Can't parse numerical argument for option --%s\n", optentry->longopt);

+			}

+			err = 1;

+		    }

+		}

+

+		arg = NULL;

+		if(err) break;

+

+		if(sizeof(lnumarg) > sizeof(numarg) && (lnumarg >> (sizeof(numarg)<<3)) )

+		    errno = ERANGE;

+

+		if(errno == ERANGE) {

 		    if(cfgfile) {

-			fprintf(stderr, "ERROR: Can't parse numerical argument for option %s\n", name);

+			fprintf(stderr, "WARNING: Numerical value for option %s too high, resetting to 4G\n", name);

 		    } else {

 			if(optentry->shortopt)

-			    fprintf(stderr, "ERROR: Can't parse numerical argument for option --%s (-%c)\n", optentry->longopt, optentry->shortopt);

+			    fprintf(stderr, "WARNING: Numerical value for option --%s (-%c) too high, resetting to 4G\n", optentry->longopt, optentry->shortopt);

 			else

-			    fprintf(stderr, "ERROR: Can't parse numerical argument for option --%s\n", optentry->longopt);

+			    fprintf(stderr, "WARNING: Numerical value for option %s too high, resetting to 4G\n", optentry->longopt);

 		    }

-		    err = 1;

-		    break;

+		    lnumarg = UINT_MAX;

 		}

-		i = strlen(arg) - 1;

-		if(arg[i] == 'M' || arg[i] == 'm')

-		    numarg *= 1048576;

-		else if(arg[i] == 'K' || arg[i] == 'k')

-		    numarg *= 1024;

-		else

-		    numarg = atoi(arg);

-		arg = NULL;

+		numarg = (unsigned int)lnumarg;

 		break;

 	    case TYPE_BOOL: