aboutsummaryrefslogtreecommitdiff
path: root/bzlib_private.h
diff options
context:
space:
mode:
Diffstat (limited to 'bzlib_private.h')
-rw-r--r--bzlib_private.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/bzlib_private.h b/bzlib_private.h
index d0a0554..2342787 100644
--- a/bzlib_private.h
+++ b/bzlib_private.h
@@ -8,8 +8,8 @@
8 This file is part of bzip2/libbzip2, a program and library for 8 This file is part of bzip2/libbzip2, a program and library for
9 lossless, block-sorting data compression. 9 lossless, block-sorting data compression.
10 10
11 bzip2/libbzip2 version 1.0.4 of 20 December 2006 11 bzip2/libbzip2 version 1.0.5 of 10 December 2007
12 Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> 12 Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
13 13
14 Please read the WARNING, DISCLAIMER and PATENTS sections in the 14 Please read the WARNING, DISCLAIMER and PATENTS sections in the
15 README file. 15 README file.
@@ -36,7 +36,7 @@
36 36
37/*-- General stuff. --*/ 37/*-- General stuff. --*/
38 38
39#define BZ_VERSION "1.0.4, 20-Dec-2006" 39#define BZ_VERSION "1.0.5, 10-Dec-2007"
40 40
41typedef char Char; 41typedef char Char;
42typedef unsigned char Bool; 42typedef unsigned char Bool;
@@ -442,11 +442,15 @@ typedef
442/*-- Macros for decompression. --*/ 442/*-- Macros for decompression. --*/
443 443
444#define BZ_GET_FAST(cccc) \ 444#define BZ_GET_FAST(cccc) \
445 /* c_tPos is unsigned, hence test < 0 is pointless. */ \
446 if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
445 s->tPos = s->tt[s->tPos]; \ 447 s->tPos = s->tt[s->tPos]; \
446 cccc = (UChar)(s->tPos & 0xff); \ 448 cccc = (UChar)(s->tPos & 0xff); \
447 s->tPos >>= 8; 449 s->tPos >>= 8;
448 450
449#define BZ_GET_FAST_C(cccc) \ 451#define BZ_GET_FAST_C(cccc) \
452 /* c_tPos is unsigned, hence test < 0 is pointless. */ \
453 if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
450 c_tPos = c_tt[c_tPos]; \ 454 c_tPos = c_tt[c_tPos]; \
451 cccc = (UChar)(c_tPos & 0xff); \ 455 cccc = (UChar)(c_tPos & 0xff); \
452 c_tPos >>= 8; 456 c_tPos >>= 8;
@@ -469,8 +473,10 @@ typedef
469 (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) 473 (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
470 474
471#define BZ_GET_SMALL(cccc) \ 475#define BZ_GET_SMALL(cccc) \
472 cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ 476 /* c_tPos is unsigned, hence test < 0 is pointless. */ \
473 s->tPos = GET_LL(s->tPos); 477 if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
478 cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \
479 s->tPos = GET_LL(s->tPos);
474 480
475 481
476/*-- externs for decompression. --*/ 482/*-- externs for decompression. --*/