Fix VI memory leak (bb #2291).

Also run clamscan under valgrind in the unit tests to catch these memory leaks
in the future.

ChangeLog

@@ -1,3 +1,7 @@
+Tue Sep 28 13:01:19 EEST 2010 (edwin)
+-------------------------------------
+ * libclamav/scanners.c: fix VI memory leak (bb #2291)
+
 Tue Sep 28 12:42:01 EEST 2010 (edwin)
 -------------------------------------
  * libclamav/pdf.c: fix mmap failed(2) on 32-bit FreeBSD (bb #2300).

libclamav/scanners.c

@@ -1823,6 +1823,7 @@ static int cli_scanraw(cli_ctx *ctx, cli_file_t type, uint8_t typercg, cli_file_
 				cli_dbgmsg("*** Detected embedded PE file at %u ***\n", (unsigned int) fpt->offset);
 				if(peinfo.section)
 				    free(peinfo.section);
+				cli_hashset_destroy(&peinfo.vinfo);
 
 				nret = cli_scanembpe(ctx, fpt->offset);
 				break_loop = 1; /* we can stop here and other

unit_tests/Makefile.am

@@ -17,7 +17,7 @@ $(FILES) :
 
 programs = check_clamav
 scripts = check_freshclam.sh check_sigtool.sh check_unit_vg.sh check1_clamscan.sh check2_clamd.sh check3_clamd.sh check4_clamd.sh\
-	  check5_clamd_vg.sh check6_clamd_vg.sh check7_clamd_hg.sh check8_clamd_hg.sh
+	  check5_clamd_vg.sh check6_clamd_vg.sh check7_clamd_hg.sh check8_clamd_hg.sh check9_clamscan_vg.sh
 TESTS_ENVIRONMENT=export abs_srcdir=$(abs_srcdir) AWK=$(AWK);
 if ENABLE_UNRAR
 else

unit_tests/Makefile.in

@@ -370,7 +370,7 @@ SPLIT_DIR = $(top_srcdir)/unit_tests/.split
 FILES = clam-phish-exe
 programs = check_clamav
 scripts = check_freshclam.sh check_sigtool.sh check_unit_vg.sh check1_clamscan.sh check2_clamd.sh check3_clamd.sh check4_clamd.sh\
-	  check5_clamd_vg.sh check6_clamd_vg.sh check7_clamd_hg.sh check8_clamd_hg.sh
+	  check5_clamd_vg.sh check6_clamd_vg.sh check7_clamd_hg.sh check8_clamd_hg.sh check9_clamscan_vg.sh
 
 TESTS_ENVIRONMENT = export abs_srcdir=$(abs_srcdir) AWK=$(AWK); \
 	$(am__append_1)
@@ -914,6 +914,8 @@ check7_clamd_hg.sh.log: check7_clamd_hg.sh
 	@p='check7_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 check8_clamd_hg.sh.log: check8_clamd_hg.sh
 	@p='check8_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
+check9_clamscan_vg.sh.log: check9_clamscan_vg.sh
+	@p='check9_clamscan_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
 .test.log:
 	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
 @am__EXEEXT_TRUE@.test$(EXEEXT).log:

unit_tests/check9_clamscan_vg.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+. $srcdir/check_common.sh
+init_valgrind
+WRAPPER="$VALGRIND $VALGRIND_FLAGS" test_clamscan 9
+end_valgrind