[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit 11643ef796c7f9fdce7989aa619b824d9d1fc6f0
Author: aCaB <acab at clamav.net>
Date:   Sun Jul 19 16:22:05 2009 +0200

    check IS scan return, add IS testfiles

diff --git a/ChangeLog b/ChangeLog
index 287eec9..976eb2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
diff --git a/libclamav/pe.c b/libclamav/pe.c
index 32d34f8..6e20878 100644
--- 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 */
diff --git a/test/.split/split.clam_IScab_ext.exeaa b/test/.split/split.clam_IScab_ext.exeaa
new file mode 100644
index 0000000..5d0a9c1
Binary files /dev/null and b/test/.split/split.clam_IScab_ext.exeaa differ
diff --git a/test/.split/split.clam_IScab_ext.exeab b/test/.split/split.clam_IScab_ext.exeab
new file mode 100644
index 0000000..e607700
Binary files /dev/null and b/test/.split/split.clam_IScab_ext.exeab differ
diff --git a/test/.split/split.clam_IScab_int.exeaa b/test/.split/split.clam_IScab_int.exeaa
new file mode 100644
index 0000000..6ef2b20
Binary files /dev/null and b/test/.split/split.clam_IScab_int.exeaa differ
diff --git a/test/.split/split.clam_IScab_int.exeab b/test/.split/split.clam_IScab_int.exeab
new file mode 100644
index 0000000..c1f70c3
Binary files /dev/null and b/test/.split/split.clam_IScab_int.exeab differ
diff --git a/test/.split/split.clam_ISmsi_ext.exeaa b/test/.split/split.clam_ISmsi_ext.exeaa
new file mode 100644
index 0000000..9dd019a
Binary files /dev/null and b/test/.split/split.clam_ISmsi_ext.exeaa differ
diff --git a/test/.split/split.clam_ISmsi_ext.exeab b/test/.split/split.clam_ISmsi_ext.exeab
new file mode 100644
index 0000000..89ddae8
Binary files /dev/null and b/test/.split/split.clam_ISmsi_ext.exeab differ
diff --git a/test/.split/split.clam_ISmsi_int.exeaa b/test/.split/split.clam_ISmsi_int.exeaa
new file mode 100644
index 0000000..eb8f0c6
Binary files /dev/null and b/test/.split/split.clam_ISmsi_int.exeaa differ
diff --git a/test/.split/split.clam_ISmsi_int.exeab b/test/.split/split.clam_ISmsi_int.exeab
new file mode 100644
index 0000000..eab46b3
Binary files /dev/null and b/test/.split/split.clam_ISmsi_int.exeab differ
diff --git a/test/Makefile.am b/test/Makefile.am
index 919b756..94d689d 100644
--- 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
 
diff --git a/test/Makefile.in b/test/Makefile.in
index e7b8af6..e960236 100644
--- 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

-- 
Debian repository for ClamAV