@@ -1,3 +1,7 @@

+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

@@ -255,6 +255,7 @@ 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;

@@ -422,13 +422,15 @@ typedef

 /*-- Macros for decompression. --*/

 #define BZ_GET_FAST(cccc)                     \

-    if (s->tPos >= s->blockSize100k * 100000) return True; \

+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \

+    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \

     s->tPos = s->tt[s->tPos];                 \

     cccc = (UChar)(s->tPos & 0xff);           \

     s->tPos >>= 8;

 #define BZ_GET_FAST_C(cccc)                   \

-    if (c_tPos >= s->blockSize100k * 100000) return True; \

+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \

+    if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \

     c_tPos = c_tt[c_tPos];                    \

     cccc = (UChar)(c_tPos & 0xff);            \

     c_tPos >>= 8;

@@ -451,6 +453,8 @@ 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);