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

+Mon Jan 26 20:56:30 CET 2004 (tk)

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

+  * libclamav: cli_scanole2 fixes from Trog

+

 Mon Jan 26 16:00:02 GMT 2004 (trog)

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

   * libclamav:	VBA decoder - Fix malloc off-by-one. Add checking

@@ -584,6 +584,7 @@ int cli_scanole2(int desc, char **virname, long int *scanned, const struct cl_no

 		}

 		free(fullname);

 		data = (unsigned char *) vba_decompress(fd, vba_project->offset[i]);

+		close(fd);

 		if(cl_scanbuff(data, strlen(data), virname, root) == CL_VIRUS) {

 		    free(data);

@@ -599,10 +600,7 @@ int cli_scanole2(int desc, char **virname, long int *scanned, const struct cl_no

 	    free(vba_project->name);

 	    free(vba_project->dir);

 	    free(vba_project->offset);

-

-	} else {

-	    cli_errmsg("ScanOLE2 -> Can't decode VBA streams.\n");

-	    ret = CL_EOLE2;

+	    free(vba_project);

 	}