[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 5c34b33fe548ce3a306cf9103137cfcf8ef97e49
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:51 2008 +0100

    Revert "bzip2 sync to upstream 1.0.5"
    
    This reverts commit c6405e1cc89482ead5ecad39a135223bfce65244.

diff --git a/ChangeLog b/ChangeLog
index e5da893..0ec8729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Fri Mar 21 03:31:16 CET 2008 (acab)
------------------------------------
-  * libclamav/nsis/bzip2: sync to upstream 1.0.5
-
 Thu Mar 20 21:27:22 CET 2008 (tk)
 ---------------------------------
   * doc/signatures.[pdf,tex]: update documentation
diff --git a/libclamav/nsis/bzlib.c b/libclamav/nsis/bzlib.c
index bb1247b..0fc9dad 100644
--- a/libclamav/nsis/bzlib.c
+++ b/libclamav/nsis/bzlib.c
@@ -255,7 +255,6 @@ Bool unRLE_obuf_to_output_FAST ( DState* s )
       UInt32        c_tPos               = s->tPos;
       UChar*        cs_next_out          = s->strm->next_out;
       unsigned int  cs_avail_out         = s->strm->avail_out;
-      Int32         ro_blockSize100k     = s->blockSize100k;
       /* end restore */
 
       UInt32       avail_out_INIT = cs_avail_out;
diff --git a/libclamav/nsis/bzlib_private.h b/libclamav/nsis/bzlib_private.h
index 1ca5e7d..22c864f 100644
--- a/libclamav/nsis/bzlib_private.h
+++ b/libclamav/nsis/bzlib_private.h
@@ -422,15 +422,13 @@ typedef
 /*-- Macros for decompression. --*/
 
 #define BZ_GET_FAST(cccc)                     \
-    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
+    if (s->tPos >= s->blockSize100k * 100000) return True; \
     s->tPos = s->tt[s->tPos];                 \
     cccc = (UChar)(s->tPos & 0xff);           \
     s->tPos >>= 8;
 
 #define BZ_GET_FAST_C(cccc)                   \
-    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-    if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
+    if (c_tPos >= s->blockSize100k * 100000) return True; \
     c_tPos = c_tt[c_tPos];                    \
     cccc = (UChar)(c_tPos & 0xff);            \
     c_tPos >>= 8;
@@ -453,8 +451,6 @@ typedef
    (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
 
 #define BZ_GET_SMALL(cccc)                            \
-      /* c_tPos is unsigned, hence test < 0 is pointless. */ \
-      if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
       cccc = indexIntoF ( s->tPos, s->cftab );    \
       s->tPos = GET_LL(s->tPos);
 

-- 
Debian repository for ClamAV