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

+Fri Jul 16 17:32:40 CEST 2004 (tk)

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

+  * libclamav: scanners: fix memory leak in new code (thanks to Trog)

+

 Fri Jul 16 02:30:03 CEST 2004 (tk)

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

   * libclamav: fix bug in memory management (thanks to Nigel)

@@ -357,11 +357,13 @@ int cl_scanbuff(const char *buffer, unsigned int length, const char **virname, c

     if((partoff = (unsigned long int *) cli_calloc(root->partsigs + 1, sizeof(unsigned long int))) == NULL) {

 	cli_dbgmsg("cli_scanbuff(): unable to cli_calloc(%d, %d)\n", root->partsigs + 1, sizeof(unsigned long int));

+	free(partcnt);

 	return CL_EMEM;

     }

     ret = cli_scanbuff(buffer, length, virname, root, partcnt, 0, 0, partoff);

     free(partcnt);

+    free(partoff);

     return ret;

 }

@@ -127,6 +127,8 @@ static int cli_scandesc(int desc, const char **virname, long int *scanned, const

     if((partoff = (unsigned long int *) cli_calloc(root->partsigs + 1, sizeof(unsigned long int))) == NULL) {

 	cli_dbgmsg("cli_scanbuff(): unable to cli_calloc(%d, %d)\n", root->partsigs + 1, sizeof(unsigned long int));

+	free(buffer);

+	free(partcnt);

 	return CL_EMEM;

     }

@@ -151,6 +153,7 @@ static int cli_scandesc(int desc, const char **virname, long int *scanned, const

 	if((ret = cli_scanbuff(pt, length, virname, root, partcnt, typerec, offset, partoff)) == CL_VIRUS) {

 	    free(buffer);

 	    free(partcnt);

+	    free(partoff);

 	    return ret;

 	} else if(typerec && ret >= CL_TYPENO) {

@@ -187,6 +190,7 @@ static int cli_scandesc(int desc, const char **virname, long int *scanned, const

     free(buffer);

     free(partcnt);

+    free(partoff);

     md5_finish_ctx(&ctx, &md5buff);

@@ -777,6 +781,7 @@ static int cli_scanhtml(int desc, const char **virname, long int *scanned, const

     return CL_CLEAN;

 #endif

+#ifdef HAVE_MMAP

     /* TODO: do file operations if mmap fails */

     if(membuff == MAP_FAILED) {

 	cli_dbgmsg("mmap failed\n");

@@ -802,6 +807,7 @@ static int cli_scanhtml(int desc, const char **virname, long int *scanned, const

     free(newbuff);

     return ret;

+#endif

 }

 static int cli_scandir(const char *dirname, const char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *arec, int *mrec)