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

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 8d89487c2e090a6fd8955d3af4470cf960e1a371
Author: Török Edvin <edwin at clamav.net>
Date:   Tue Feb 9 13:40:02 2010 +0200

    Show more details about zlib when inflateinit fails.

diff --git a/libclamav/scanners.c b/libclamav/scanners.c
index bbc0509..a4b44ed 100644
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@@ -414,6 +414,13 @@ static int cli_scangzip(cli_ctx *ctx)
     memset(&z, 0, sizeof(z));
     if((ret = inflateInit2(&z, MAX_WBITS + 16)) != Z_OK) {
 	cli_dbgmsg("GZip: InflateInit failed: %d\n", ret);
+#ifdef ZLIB_VERNUM
+	cli_dbgmsg("zlib version %s (%04x), build flags = 0x%lx, runtime version %s\n",
+		   ZLIB_VERSION, ZLIB_VERNUM, zlibCompileFlags(), zlibVersion());
+#else
+	cli_dbgmsg("zlib version %s, runtime version %s\n",
+		   ZLIB_VERSION, zlibVersion());
+#endif
 	return CL_CLEAN;
     }
 

-- 
Debian repository for ClamAV