@@ -228,7 +228,7 @@ int scanmanager(const struct optstruct *opt)

 	char *cpy, *ptr;

 	ptr = opt_arg(opt, "max-space");

 	if(tolower(ptr[strlen(ptr) - 1]) == 'm') {

-	    cpy = malloc(strlen(ptr));

+	    cpy = calloc(strlen(ptr), 1);

 	    strncpy(cpy, ptr, strlen(ptr) - 1);

 	    limits.maxfilesize = atoi(cpy) * 1024 * 1024;

 	    free(cpy);

@@ -433,7 +433,7 @@ static int clamav_unpack(const char *prog, char **args, const char *tmpdir, cons

 	    char *cpy, *ptr;

 	ptr = opt_arg(opt, "max-space");

 	if(tolower(ptr[strlen(ptr) - 1]) == 'm') { /* megabytes */

-	    cpy = malloc(strlen(ptr));

+	    cpy = calloc(strlen(ptr), 1);

 	    strncpy(cpy, ptr, strlen(ptr) - 1);

 	    maxspace = atoi(cpy) * 1024;

 	    free(cpy);

@@ -285,7 +285,7 @@ struct cfgstruct *getcfg(const char *cfgfile, int verbose)

 				}

 				ctype = tolower(arg[strlen(arg) - 1]);

 				if(ctype == 'm' || ctype == 'k') {

-				    char *cpy = (char *) malloc(strlen(arg));

+				    char *cpy = (char *) calloc(strlen(arg), 1);

 				    strncpy(cpy, arg, strlen(arg) - 1);

 				    if(!isnumb(cpy)) {

 					if(verbose)

@@ -192,7 +192,7 @@ int logg(const char *str, ...)

 	    if(logg_time && ((*str != '*') || logg_verbose)) {

 		time(&currtime);

 		pt = ctime(&currtime);

-		timestr = malloc(strlen(pt));

+		timestr = calloc(strlen(pt), 1);

 		strncpy(timestr, pt, strlen(pt) - 1);

 		fprintf(logg_fd, "%s -> ", timestr);

 		free(timestr);