[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa
Stephen Gran
steve at lobefin.net
Thu Sep 4 12:36:37 UTC 2008
The following commit has been merged in the debian/unstable branch:
commit 084411e084880bfcc8c975bfb6f7f6c042cc17a9
Author: Stephen Gran <steve at lobefin.net>
Date: Thu Sep 4 13:25:10 2008 +0100
Revert "sync with 0.93.3"
This reverts commit 2660b5f957451ebbb21272ce417bf16d2a396514.
diff --git a/ChangeLog b/ChangeLog
index 6f414ae..48fd435 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,30 +1,8 @@
-Mon Jul 7 19:31:24 CEST 2008
------------------------------
- * 0.93.3: fix handling of .cld files
-
-Mon Jul 7 15:48:48 CEST 2008
------------------------------
- * 0.93.2
-
Mon Jul 7 15:41:02 CEST 2008 (tk)
----------------------------------
* libclamav/ole2_extract.c, sigtool: make sigtool compatible with the new
OLE2 scan scheme (bb#1086)
-Mon Jul 7 15:41:02 CEST 2008 (tk)
-----------------------------------
- * libclamav/ole2_extract.c, sigtool: make sigtool compatible with the new
- OLE2 scan scheme (bb#1086)
-
-Thu Jul 3 16:15:23 CEST 2008
------------------------------
- * libclamav/petite.c: fix another out of bounds memory read (bb#1000)
- Reported by Secunia (CVE-2008-2713)
-
-Thu Jul 3 16:04:01 CEST 2008
------------------------------
- * clamd/others.c: add missing checks for recv() failures (bb#1079)
-
Thu Jul 3 16:02:03 EEST 2008 (edwin)
-------------------------------------
* libclamav/scanners.c: add missing check for file open failure (bb #1083).
diff --git a/NEWS b/NEWS
index e256bde..f303ed4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
-0.93.3
+0.93.1
------
-This release fixes a problem in handling of .cld files introduced in 0.93.2.
+This version improves handling of PDF, CAB, RTF, OLE2 and HTML files
+and includes various bugfixes for 0.93 issues.
--
The ClamAV team (http://www.clamav.net/team)
diff --git a/README b/README
index a07e4d4..f7bb180 100644
--- a/README
+++ b/README
@@ -2,26 +2,6 @@ Note: This README/NEWS file refers to the source tarball. Some things described
here may not be available in binary packages.
--
-
-0.93.3
-------
-
-This release fixes a problem in handling of .cld files introduced in 0.93.2.
-
---
-The ClamAV team (http://www.clamav.net/team)
-
-
-0.93.2
-------
-
-This release fixes and re-enables the Petite unpacker, improves database
-loading and solves some other minor issues.
-
---
-The ClamAV team (http://www.clamav.net/team)
-
-
0.93.1
------
diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
index aef3b98..1962a20 100644
--- a/clamav-milter/clamav-milter.c
+++ b/clamav-milter/clamav-milter.c
@@ -33,7 +33,7 @@
*/
static char const rcsid[] = "$Id: clamav-milter.c,v 1.312 2007/02/12 22:24:21 njh Exp $";
-#define CM_VERSION "0.93.3"
+#define CM_VERSION "0.93.1"
#if HAVE_CONFIG_H
#include "clamav-config.h"
diff --git a/clamd/others.c b/clamd/others.c
index c3568d7..0470241 100644
--- a/clamd/others.c
+++ b/clamd/others.c
@@ -381,8 +381,6 @@ int readsock(int sockfd, char *buf, size_t size, unsigned char delim, int timeou
break;
}
n = recv(sockfd, buf, size, MSG_PEEK);
- if(n < 0)
- return -1;
if(read_command) {
if((n >= 1) && (buf[0] == 0)) { /* FD message */
#ifdef HAVE_RECVMSG
@@ -474,8 +472,6 @@ int readsock(int sockfd, char *buf, size_t size, unsigned char delim, int timeou
if(n == 0)
break;
}
- if(n < 0)
- return -1;
n += boff;
if(read_command) {
if((n >= 1) && (buf[0] == 'n')) { /* Need to strip leading 'n' from command to attain standard command */
diff --git a/configure b/configure
index c9a1867..7392865 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for clamav 0.93.3.
+# Generated by GNU Autoconf 2.61 for clamav 0.93.1.
#
# Report bugs to <http://bugs.clamav.net/>.
#
@@ -724,8 +724,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='clamav'
PACKAGE_TARNAME='clamav'
-PACKAGE_VERSION='0.93.3'
-PACKAGE_STRING='clamav 0.93.3'
+PACKAGE_VERSION='0.93.1'
+PACKAGE_STRING='clamav 0.93.1'
PACKAGE_BUGREPORT='http://bugs.clamav.net/'
ac_unique_file="clamscan/clamscan.c"
@@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures clamav 0.93.3 to adapt to many kinds of systems.
+\`configure' configures clamav 0.93.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1480,7 +1480,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of clamav 0.93.3:";;
+ short | recursive ) echo "Configuration of clamav 0.93.1:";;
esac
cat <<\_ACEOF
@@ -1615,7 +1615,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-clamav configure 0.93.3
+clamav configure 0.93.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1629,7 +1629,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by clamav $as_me 0.93.3, which was
+It was created by clamav $as_me 0.93.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2639,7 +2639,7 @@ fi
# Define the identity of the package.
PACKAGE='clamav'
- VERSION='0.93.3'
+ VERSION='0.93.1'
# Some tools Automake needs.
@@ -2783,7 +2783,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
-VERSION="0.93.3"
+VERSION="0.93.1"
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
@@ -2791,7 +2791,7 @@ _ACEOF
LC_CURRENT=4
-LC_REVISION=4
+LC_REVISION=3
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
@@ -19000,7 +19000,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by clamav $as_me 0.93.3, which was
+This file was extended by clamav $as_me 0.93.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19053,7 +19053,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-clamav config.status 0.93.3
+clamav config.status 0.93.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index 0795578..01e6aee 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ dnl MA 02110-1301, USA.
AC_PREREQ([2.59])
dnl For a release change [devel] to the real version [0.xy]
dnl also change VERSION below
-AC_INIT([clamav], [0.93.3], [http://bugs.clamav.net/])
+AC_INIT([clamav], [0.93.1], [http://bugs.clamav.net/])
dnl put configure auxiliary into config
AC_CONFIG_AUX_DIR([config])
@@ -41,11 +41,11 @@ AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
dnl change this on a release
dnl VERSION="devel-`date +%Y%m%d`"
-VERSION="0.93.3"
+VERSION="0.93.1"
AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
LC_CURRENT=4
-LC_REVISION=4
+LC_REVISION=3
LC_AGE=0
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
AC_SUBST([LIBCLAMAV_VERSION])
diff --git a/docs/clamdoc.pdf b/docs/clamdoc.pdf
index b4ec26a..a3298c5 100644
Binary files a/docs/clamdoc.pdf and b/docs/clamdoc.pdf differ
diff --git a/docs/clamdoc.tex b/docs/clamdoc.tex
index 7a5cc62..6ecae54 100644
--- a/docs/clamdoc.tex
+++ b/docs/clamdoc.tex
@@ -71,7 +71,7 @@
\vspace{3cm}
\begin{flushright}
\rule[-1ex]{8cm}{3pt}\\
- \huge Clam AntiVirus 0.93.3\\
+ \huge Clam AntiVirus 0.93.1\\
\huge \emph{User Manual}\\
\end{flushright}
diff --git a/docs/html/clamdoc.html b/docs/html/clamdoc.html
index 64da9fe..4bffd32 100644
--- a/docs/html/clamdoc.html
+++ b/docs/html/clamdoc.html
@@ -56,7 +56,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR>
<BR>
<DIV ALIGN="RIGHT">
-<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.93.3
+<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.93.1
<BR> <BIG CLASS="HUGE"><SPAN CLASS="textit">User Manual</SPAN>
<BR>
</BIG></BIG></DIV>
@@ -211,7 +211,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/index.html b/docs/html/index.html
index 64da9fe..4bffd32 100644
--- a/docs/html/index.html
+++ b/docs/html/index.html
@@ -56,7 +56,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR>
<BR>
<DIV ALIGN="RIGHT">
-<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.93.3
+<BR> <BIG CLASS="HUGE">Clam AntiVirus 0.93.1
<BR> <BIG CLASS="HUGE"><SPAN CLASS="textit">User Manual</SPAN>
<BR>
</BIG></BIG></DIV>
@@ -211,7 +211,7 @@ original version by: Nikos Drakos, CBLU, University of Leeds
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node1.html b/docs/html/node1.html
index b66de40..fbb7f64 100644
--- a/docs/html/node1.html
+++ b/docs/html/node1.html
@@ -179,7 +179,7 @@ ClamAV and Clam AntiVirus are trademarks of Sourcefire, Inc.
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node10.html b/docs/html/node10.html
index 3ea622b..da9c555 100644
--- a/docs/html/node10.html
+++ b/docs/html/node10.html
@@ -96,7 +96,7 @@ A note for Solaris/SPARC users: you must set the <SPAN CLASS="textit">ABI</SPAN
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node11.html b/docs/html/node11.html
index c9eff06..437d39b 100644
--- a/docs/html/node11.html
+++ b/docs/html/node11.html
@@ -75,7 +75,7 @@ Installing on shell account</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node12.html b/docs/html/node12.html
index 471ba22..fd5dbb8 100644
--- a/docs/html/node12.html
+++ b/docs/html/node12.html
@@ -69,7 +69,7 @@ Adding new system user and group</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node13.html b/docs/html/node13.html
index 38aecd6..0623d1f 100644
--- a/docs/html/node13.html
+++ b/docs/html/node13.html
@@ -75,7 +75,7 @@ Compilation of base package</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node14.html b/docs/html/node14.html
index d733a32..cbfbbba 100644
--- a/docs/html/node14.html
+++ b/docs/html/node14.html
@@ -64,7 +64,7 @@ Compilation with clamav-milter enabled</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node15.html b/docs/html/node15.html
index a05aca6..b8e801b 100644
--- a/docs/html/node15.html
+++ b/docs/html/node15.html
@@ -83,7 +83,7 @@ Configuration</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node16.html b/docs/html/node16.html
index 5ca7654..b8e39c5 100644
--- a/docs/html/node16.html
+++ b/docs/html/node16.html
@@ -79,7 +79,7 @@ clamd</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node17.html b/docs/html/node17.html
index ba5d31b..d930226 100644
--- a/docs/html/node17.html
+++ b/docs/html/node17.html
@@ -90,7 +90,7 @@ On-access scanning</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node18.html b/docs/html/node18.html
index 54e617b..2075e45 100644
--- a/docs/html/node18.html
+++ b/docs/html/node18.html
@@ -81,7 +81,7 @@ define(`confINPUT_MAIL_FILTERS', `clmilter')
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node19.html b/docs/html/node19.html
index b257d98..63b49cf 100644
--- a/docs/html/node19.html
+++ b/docs/html/node19.html
@@ -75,7 +75,7 @@ Testing</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node2.html b/docs/html/node2.html
index 5d387bc..fa0642f 100644
--- a/docs/html/node2.html
+++ b/docs/html/node2.html
@@ -79,7 +79,7 @@ Introduction</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node20.html b/docs/html/node20.html
index 18996ae..d6c8c2a 100644
--- a/docs/html/node20.html
+++ b/docs/html/node20.html
@@ -139,7 +139,7 @@ N * * * * /usr/local/bin/freshclam --quiet
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node21.html b/docs/html/node21.html
index 7964dae..0d481cb 100644
--- a/docs/html/node21.html
+++ b/docs/html/node21.html
@@ -77,7 +77,7 @@ Closest mirrors</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node22.html b/docs/html/node22.html
index 640de32..6c9deb0 100644
--- a/docs/html/node22.html
+++ b/docs/html/node22.html
@@ -80,7 +80,7 @@ Usage</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node23.html b/docs/html/node23.html
index 0718f91..ab7c25f 100644
--- a/docs/html/node23.html
+++ b/docs/html/node23.html
@@ -160,7 +160,7 @@ Start/end a <code>clamd</code> session - you can do multiple commands
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node24.html b/docs/html/node24.html
index 5127e4c..e804f15 100644
--- a/docs/html/node24.html
+++ b/docs/html/node24.html
@@ -76,7 +76,7 @@ Clam<SPAN CLASS="textbf">d</SPAN>scan</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node25.html b/docs/html/node25.html
index 9b4f9fb..0033421 100644
--- a/docs/html/node25.html
+++ b/docs/html/node25.html
@@ -92,7 +92,7 @@ SIGTERM signal. In other case you can lose access
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node26.html b/docs/html/node26.html
index 6fbdd11..273b1f5 100644
--- a/docs/html/node26.html
+++ b/docs/html/node26.html
@@ -70,7 +70,7 @@ Output format</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node27.html b/docs/html/node27.html
index ed93ce6..e88bb2f 100644
--- a/docs/html/node27.html
+++ b/docs/html/node27.html
@@ -94,7 +94,7 @@ clamscan</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node28.html b/docs/html/node28.html
index 510892e..36989d4 100644
--- a/docs/html/node28.html
+++ b/docs/html/node28.html
@@ -83,7 +83,7 @@ Error messages are printed in the following format:
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node29.html b/docs/html/node29.html
index ae3ca2d..381f302 100644
--- a/docs/html/node29.html
+++ b/docs/html/node29.html
@@ -126,7 +126,7 @@ LibClamAV</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node3.html b/docs/html/node3.html
index 3200aec..7e364d3 100644
--- a/docs/html/node3.html
+++ b/docs/html/node3.html
@@ -183,7 +183,7 @@ Features</A>
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node30.html b/docs/html/node30.html
index 288579d..69afeb5 100644
--- a/docs/html/node30.html
+++ b/docs/html/node30.html
@@ -65,7 +65,7 @@ Licence</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node31.html b/docs/html/node31.html
index 965d785..7cfcec1 100644
--- a/docs/html/node31.html
+++ b/docs/html/node31.html
@@ -77,7 +77,7 @@ Supported formats</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node32.html b/docs/html/node32.html
index 42bcee0..1b69ef7 100644
--- a/docs/html/node32.html
+++ b/docs/html/node32.html
@@ -87,7 +87,7 @@ Executables</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node33.html b/docs/html/node33.html
index 115fbfc..83cc6f9 100644
--- a/docs/html/node33.html
+++ b/docs/html/node33.html
@@ -62,7 +62,7 @@ Mail files</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node34.html b/docs/html/node34.html
index 8eba99f..5ac7d46 100644
--- a/docs/html/node34.html
+++ b/docs/html/node34.html
@@ -90,7 +90,7 @@ Archives and compressed files</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node35.html b/docs/html/node35.html
index ff6b206..717bc83 100644
--- a/docs/html/node35.html
+++ b/docs/html/node35.html
@@ -73,7 +73,7 @@ Documents</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node36.html b/docs/html/node36.html
index 4a9ab30..2db578f 100644
--- a/docs/html/node36.html
+++ b/docs/html/node36.html
@@ -75,7 +75,7 @@ Others</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node37.html b/docs/html/node37.html
index ed64b37..d34bbd0 100644
--- a/docs/html/node37.html
+++ b/docs/html/node37.html
@@ -75,7 +75,7 @@ API</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node38.html b/docs/html/node38.html
index 09bfcd9..581caa7 100644
--- a/docs/html/node38.html
+++ b/docs/html/node38.html
@@ -64,7 +64,7 @@ Header file</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node39.html b/docs/html/node39.html
index 1a5179c..a8a0c5a 100644
--- a/docs/html/node39.html
+++ b/docs/html/node39.html
@@ -111,7 +111,7 @@ Load CVD files directly without unpacking them into a temporary
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node4.html b/docs/html/node4.html
index 32b70c6..428788f 100644
--- a/docs/html/node4.html
+++ b/docs/html/node4.html
@@ -86,7 +86,7 @@ Alternatively you can try asking on the <code>#clamav</code> IRC channel - launc
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node40.html b/docs/html/node40.html
index 757304a..e25d657 100644
--- a/docs/html/node40.html
+++ b/docs/html/node40.html
@@ -68,7 +68,7 @@ Error handling</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node41.html b/docs/html/node41.html
index ced001c..4dca09f 100644
--- a/docs/html/node41.html
+++ b/docs/html/node41.html
@@ -74,7 +74,7 @@ Engine structure</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node42.html b/docs/html/node42.html
index 5ab6952..469b563 100644
--- a/docs/html/node42.html
+++ b/docs/html/node42.html
@@ -103,7 +103,7 @@ Database reloading</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node43.html b/docs/html/node43.html
index f4e467b..265b0b5 100644
--- a/docs/html/node43.html
+++ b/docs/html/node43.html
@@ -214,7 +214,7 @@ Phishing module: always block cloaked URLs.
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node44.html b/docs/html/node44.html
index e79db07..d3e6fd3 100644
--- a/docs/html/node44.html
+++ b/docs/html/node44.html
@@ -62,7 +62,7 @@ Memory</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node45.html b/docs/html/node45.html
index 1e2c365..19a0c09 100644
--- a/docs/html/node45.html
+++ b/docs/html/node45.html
@@ -65,7 +65,7 @@ Forking daemons</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node46.html b/docs/html/node46.html
index 0b82e75..075af26 100644
--- a/docs/html/node46.html
+++ b/docs/html/node46.html
@@ -67,7 +67,7 @@ clamav-config</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node47.html b/docs/html/node47.html
index 36e3482..000ca8f 100644
--- a/docs/html/node47.html
+++ b/docs/html/node47.html
@@ -65,7 +65,7 @@ Example</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node48.html b/docs/html/node48.html
index f922cf4..915fd65 100644
--- a/docs/html/node48.html
+++ b/docs/html/node48.html
@@ -82,7 +82,7 @@ Verification OK.
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node49.html b/docs/html/node49.html
index 4a574ca..bd332f8 100644
--- a/docs/html/node49.html
+++ b/docs/html/node49.html
@@ -613,7 +613,7 @@ Contributors</A>
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node5.html b/docs/html/node5.html
index 5f04371..568adb6 100644
--- a/docs/html/node5.html
+++ b/docs/html/node5.html
@@ -65,7 +65,7 @@ Virus submitting</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node50.html b/docs/html/node50.html
index 1c3418e..1244324 100644
--- a/docs/html/node50.html
+++ b/docs/html/node50.html
@@ -459,7 +459,7 @@ Donors</A>
<!--End of Navigation Panel-->
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node51.html b/docs/html/node51.html
index 6dc0c70..68b802a 100644
--- a/docs/html/node51.html
+++ b/docs/html/node51.html
@@ -63,7 +63,7 @@ Graphics</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node52.html b/docs/html/node52.html
index 2a3ed2a..824cd4e 100644
--- a/docs/html/node52.html
+++ b/docs/html/node52.html
@@ -62,7 +62,7 @@ OpenAntiVirus</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node53.html b/docs/html/node53.html
index f742d96..171ade6 100644
--- a/docs/html/node53.html
+++ b/docs/html/node53.html
@@ -134,7 +134,7 @@ Role: coder
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node54.html b/docs/html/node54.html
index 2f9797c..dcd6e00 100644
--- a/docs/html/node54.html
+++ b/docs/html/node54.html
@@ -64,11 +64,11 @@ Mathematics Department, Macquarie University, Sydney.
The command line arguments were: <BR>
<STRONG>latex2html</STRONG> <TT>-local_icons clamdoc.tex</TT>
<P>
-The translation was initiated by Tomasz Kojm on 2008-07-07
+The translation was initiated by Tomasz Kojm on 2008-06-04
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node6.html b/docs/html/node6.html
index 37a5332..4ad9436 100644
--- a/docs/html/node6.html
+++ b/docs/html/node6.html
@@ -71,7 +71,7 @@ Base package</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node7.html b/docs/html/node7.html
index 18f0277..cc1dc7c 100644
--- a/docs/html/node7.html
+++ b/docs/html/node7.html
@@ -80,7 +80,7 @@ Supported platforms</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node8.html b/docs/html/node8.html
index a857314..8751a1b 100644
--- a/docs/html/node8.html
+++ b/docs/html/node8.html
@@ -61,7 +61,7 @@ Binary packages</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/docs/html/node9.html b/docs/html/node9.html
index cee0e98..09f125b 100644
--- a/docs/html/node9.html
+++ b/docs/html/node9.html
@@ -77,7 +77,7 @@ Installation</A>
<BR><HR>
<ADDRESS>
Tomasz Kojm
-2008-07-07
+2008-06-04
</ADDRESS>
</BODY>
</HTML>
diff --git a/libclamav/cvd.c b/libclamav/cvd.c
index 9a63cf2..e10e396 100644
--- a/libclamav/cvd.c
+++ b/libclamav/cvd.c
@@ -214,13 +214,11 @@ static int cli_tgzload(int fd, struct cl_engine **engine, unsigned int *signo, u
cli_errmsg("cli_tgzload: Can't gzdopen() descriptor %d, errno = %d\n", fdd, errno);
return CL_EIO;
}
- dbio.fs = NULL;
} else {
if((dbio.fs = fdopen(fdd, "rb")) == NULL) {
cli_errmsg("cli_tgzload: Can't fdopen() descriptor %d, errno = %d\n", fdd, errno);
return CL_EIO;
}
- dbio.gzs = NULL;
}
while(1) {
diff --git a/libclamav/mspack.c b/libclamav/mspack.c
index 8582a76..a3547b7 100644
--- a/libclamav/mspack.c
+++ b/libclamav/mspack.c
@@ -1286,8 +1286,6 @@ int lzx_decompress(struct lzx_stream *lzx, off_t out_bytes) {
}
else {
runsrc = rundest - match_offset;
- if(i > (int) lzx->window_size - window_posn)
- i = lzx->window_size - window_posn;
while (i-- > 0) *rundest++ = *runsrc++;
}
@@ -1902,8 +1900,6 @@ int qtm_decompress(struct qtm_stream *qtm, off_t out_bytes) {
}
else {
runsrc = rundest - match_offset;
- if(i > (int) qtm->window_size - window_posn)
- i = qtm->window_size - window_posn;
while (i-- > 0) *rundest++ = *runsrc++;
}
window_posn += match_length;
diff --git a/libclamav/others.c b/libclamav/others.c
index 00dc9e4..ecbc5fc 100644
--- a/libclamav/others.c
+++ b/libclamav/others.c
@@ -87,7 +87,7 @@ static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;
#define P_tmpdir "C:\\WINDOWS\\TEMP"
#endif
-#define CL_FLEVEL 33 /* don't touch it */
+#define CL_FLEVEL 31 /* don't touch it */
uint8_t cli_debug_flag = 0, cli_leavetemps_flag = 0;
diff --git a/libclamav/petite.c b/libclamav/petite.c
index 5ebe8f9..6d81aa3 100644
--- a/libclamav/petite.c
+++ b/libclamav/petite.c
@@ -214,14 +214,8 @@ int petite_inflate2x_1to9(char *buf, uint32_t minrva, uint32_t bufsz, struct cli
/* Let's compact data */
for (t = 0; t < j ; t++) {
usects[t].raw = (t>0)?(usects[t-1].raw + usects[t-1].rsz):0;
- if (usects[t].rsz != 0)
- if(CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz)) {
- memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz);
- } else {
- cli_dbgmsg("Petite: Skipping section %d, Raw: %x, RSize:%x\n", t, usects[t].raw, usects[t].rsz);
- usects[t].raw = t>0 ? usects[t-1].raw : 0;
- usects[t].rsz = 0;
- }
+ if (usects[t].rsz != 0 && CLI_ISCONTAINED(buf, bufsz, buf + usects[t].raw, usects[t].rsz))
+ memmove(buf + usects[t].raw, adjbuf + usects[t].rva, usects[t].rsz);
}
/* Showtime!!! */
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list