Attachment #146488 for bug #213820

View | Details | Raw Unified | Return to bug 213820
Collapse All | Expand All

Lines 598-603 Link Here

(-)bzip2-1.0.4/bzlib.c (+1 lines)
598	UInt32 c_tPos = s->tPos;	598	UInt32 c_tPos = s->tPos;
599	char* cs_next_out = s->strm->next_out;	599	char* cs_next_out = s->strm->next_out;
600	unsigned int cs_avail_out = s->strm->avail_out;	600	unsigned int cs_avail_out = s->strm->avail_out;
		601	Int32 ro_blockSize100k = s->blockSize100k;
601	/* end restore */	602	/* end restore */
602		603
603	UInt32 avail_out_INIT = cs_avail_out;	604	UInt32 avail_out_INIT = cs_avail_out;

Lines 442-452 Link Here

(-)bzip2-1.0.4/bzlib_private.h (-2 / +8 lines)
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;
Lines 469-476 Link Here
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. --/

Return to bug 213820