check IS scan return, add IS testfiles

16 years ago · 11643ef796
parent 489acd9ddc
commit 11643ef796
12 changed files with 16 additions and 4 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+Sun Jul 19 16:19:49 CEST 2009 (acab)
+------------------------------------
+ * libclamav/pe.c: check IS-cab scan result
+ * test/: add IS test files
+
 Fri Jul 17 12:48:24 EEST 2009 (edwin)
 -------------------------------------
 * libclamav/regex_list.[ch]: improve safebrowsing.cvd load speed (20s -> 3s)
--- a/libclamav/pe.c
+++ b/libclamav/pe.c
@ -1021,8 +1021,13 @@ int cli_scanpe(int desc, cli_ctx *ctx)

    if(overlays) {
 	int overlays_sz = fsize - overlays;
-	if(overlays_sz > 0)
-	    cli_scanishield(desc, ctx, overlays, overlays_sz);
+	if(overlays_sz > 0) {
+	    ret = cli_scanishield(desc, ctx, overlays, overlays_sz);
+	    if(ret != CL_CLEAN) {
+		free(exe_sections);
+		return ret;
+	    }
+	}
    }

    /* Attempt to detect some popular polymorphic viruses */
--- a/test/.split/split.clam_IScab_ext.exeaa
+++ b/test/.split/split.clam_IScab_ext.exeaa
--- a/test/.split/split.clam_IScab_ext.exeab
+++ b/test/.split/split.clam_IScab_ext.exeab
--- a/test/.split/split.clam_IScab_int.exeaa
+++ b/test/.split/split.clam_IScab_int.exeaa
--- a/test/.split/split.clam_IScab_int.exeab
+++ b/test/.split/split.clam_IScab_int.exeab
--- a/test/.split/split.clam_ISmsi_ext.exeaa
+++ b/test/.split/split.clam_ISmsi_ext.exeaa
--- a/test/.split/split.clam_ISmsi_ext.exeab
+++ b/test/.split/split.clam_ISmsi_ext.exeab
--- a/test/.split/split.clam_ISmsi_int.exeaa
+++ b/test/.split/split.clam_ISmsi_int.exeaa
--- a/test/.split/split.clam_ISmsi_int.exeab
+++ b/test/.split/split.clam_ISmsi_int.exeab
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -5,7 +5,8 @@ FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \
 	clam.mail clam.ppt clam.tnef clam.ea05.exe clam.ea06.exe clam.d64.zip\
 	clam.exe.mbox.base64 clam.exe.mbox.uu clam.exe.binhex clam.ole.doc \
 	clam.impl.zip clam.exe.html clam.bz2.zip clam.bin-be.cpio clam.bin-le.cpio \
-	clam.newc.cpio clam.odc.cpio clam-yc.exe
+	clam.newc.cpio clam.odc.cpio clam-yc.exe clam_IScab_int.exe \
+	clam_IScab_ext.exe clam_ISmsi_int.exe clam_ISmsi_ext.exe

 SPLIT_DIR=$(top_srcdir)/test/.split

--- a/test/Makefile.in
+++ b/test/Makefile.in
@ -214,7 +214,8 @@ FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \
 	clam.mail clam.ppt clam.tnef clam.ea05.exe clam.ea06.exe clam.d64.zip\
 	clam.exe.mbox.base64 clam.exe.mbox.uu clam.exe.binhex clam.ole.doc \
 	clam.impl.zip clam.exe.html clam.bz2.zip clam.bin-be.cpio clam.bin-le.cpio \
-	clam.newc.cpio clam.odc.cpio clam-yc.exe
+	clam.newc.cpio clam.odc.cpio clam-yc.exe clam_IScab_int.exe \
+	clam_IScab_ext.exe clam_ISmsi_int.exe clam_ISmsi_ext.exe

 SPLIT_DIR = $(top_srcdir)/test/.split
 EXTRA_DIST = .split