[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 7e65889c67b5858c2fe84650081acae29c816380
Author: aCaB <acab at clamav.net>
Date:   Mon Sep 7 03:48:04 2009 +0200

    properly scan text files with a mail container

diff --git a/ChangeLog b/ChangeLog
index d35a0f0..8d67218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep  7 03:45:18 CEST 2009 (acab)
+------------------------------------
+ * libclamav/scanners.c: properly scan text files with a mail container
+
 Thu Sep  3 15:09:57 CEST 2009 (tk)
 ----------------------------------
  * freshclam/mirman.c: make backoff time proportional to FLEVEL (bb#1687)
diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index 10e8fba..2eab5f6 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -2138,8 +2138,10 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)
 	case CL_TYPE_TEXT_UTF8:
 	    if((DCONF_DOC & DOC_CONF_SCRIPT) && dettype != CL_TYPE_HTML)
 	        ret = cli_scanscript(desc, ctx);
-	    if(ret != CL_VIRUS && ctx->container_type == CL_TYPE_MAIL)
+	    if(ret != CL_VIRUS && ctx->container_type == CL_TYPE_MAIL) {
+		lseek(desc, 0, SEEK_SET);
 		ret = cli_scandesc(desc, ctx, CL_TYPE_MAIL, 0, NULL, AC_SCAN_VIR);
+	    }
 	    break;
 	/* Due to performance reasons all executables were first scanned
 	 * in raw mode. Now we will try to unpack them

-- 
Debian repository for ClamAV