Attachment 298695 Details for Bug 438118 – Upstream patch

[patch] Upstream patch

bzip2-1.0.5.patch (text/plain), 1.83 KB, created by Josh Bressers on 2008-03-20 14:03:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2008-03-20 14:03:52 UTC

Size: 1.83 KB

patch

obsolete

>diff -urN bzip2-1.0.4/bzlib.c bzip2-1.0.5/bzlib.c
>--- bzip2-1.0.4/bzlib.c	2007-01-02 21:00:55.000000000 -0500
>+++ bzip2-1.0.5/bzlib.c	2007-12-09 08:57:21.000000000 -0500
>@@ -598,6 +598,7 @@
>       UInt32        c_tPos               = s->tPos;
>       char*         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 -urN bzip2-1.0.4/bzlib_private.h bzip2-1.0.5/bzlib_private.h
>--- bzip2-1.0.4/bzlib_private.h	2007-01-02 21:00:55.000000000 -0500
>+++ bzip2-1.0.5/bzlib_private.h	2007-12-09 09:00:46.000000000 -0500
>@@ -442,11 +442,15 @@
> /*-- 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; \
>     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; \
>     c_tPos = c_tt[c_tPos];                    \
>     cccc = (UChar)(c_tPos & 0xff);            \
>     c_tPos >>= 8;
>@@ -469,8 +473,10 @@
>    (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
> 
> #define BZ_GET_SMALL(cccc)                            \
>-      cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
>-      s->tPos = GET_LL(s->tPos);
>+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
>+    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
>+    cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
>+    s->tPos = GET_LL(s->tPos);
> 
> 
> /*-- externs for decompression. --*/

Actions: View | Diff

Attachments on bug 438118: 298695