Attachment #95405 for bug #145511

Lines 198-203 Link Here

(-)gzip-1.3.5.orig/gzip.h (+2 lines)
198	extern int to_stdout; /* output to stdout (-c) */	198	extern int to_stdout; /* output to stdout (-c) */
199	extern int save_orig_name; /* set if original name must be saved */	199	extern int save_orig_name; /* set if original name must be saved */
200		200
		201	#define MIN(a,b) ((a) <= (b) ? (a) : (b))
		202
201	#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))	203	#define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
202	#define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))	204	#define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
203		205

Lines 337-343 Link Here

(-)gzip-1.3.5.orig/inflate.c (-1 / +1 lines)
337	{	337	{
338	t = (struct huft )NULL;	338	t = (struct huft )NULL;
339	*m = 0;	339	*m = 0;
340	return 0;	340	return 2;
341	}	341	}
342		342
343		343




    unsigned i, k, len, ch, jutbits, avail, nextcode, mask;

    for (i = 1; i <= 16; i++) count[i] = 0;
    for (i = 0; i < (unsigned)nchar; i++) {
        if (bitlen[i] > 16)
        error("Bad table (case a)\n");
        else count[bitlen[i]]++;
    }

    start[1] = 0;
    for (i = 1; i <= 16; i++)
	start[i + 1] = start[i] + (count[i] << (16 - i));
    if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
	error("Bad table (case b)\n");

    jutbits = 16 - tablebits;
    for (i = 1; i <= (unsigned)tablebits; i++) {


    i = start[tablebits + 1] >> jutbits;
    if (i != 0) {
	k = MIN(1 << tablebits, DIST_BUFSIZE);
	while (i < k) table[i++] = 0;
    }

    avail = nchar;
    mask = (unsigned) 1 << (15 - tablebits);
    for (ch = 0; ch < (unsigned)nchar; ch++) {
	if ((len = bitlen[ch]) == 0) continue;
	nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE);
	if (len <= (unsigned)tablebits) {
	    for (i = start[len]; i < nextcode; i++) table[i] = ch;
	} else {

	for (i = 0; i < 256; i++) pt_table[i] = c;
    } else {
	i = 0;
	while (i < MIN(n,NPT)) {
	    c = bitbuf >> (BITBUFSIZ - 3);
	    if (c == 7) {
		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);

	    pt_len[i++] = c;
	    if (i == i_special) {
		c = getbits(2);
		while (--c >= 0 && i < NPT) pt_len[i++] = 0;
	    }
	}
	while (i < nn) pt_len[i++] = 0;

	for (i = 0; i < 4096; i++) c_table[i] = c;
    } else {
	i = 0;
	while (i < MIN(n,NC)) {
	    c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
	    if (c >= NT) {
		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);

		    if (bitbuf & mask) c = right[c];
		    else               c = left [c];
		    mask >>= 1;
		} while (c >= NT && (mask || c != left[c]));
	    }
	    fillbuf((int) pt_len[c]);
	    if (c <= 2) {
		if      (c == 0) c = 1;
		else if (c == 1) c = getbits(4) + 3;
		else             c = getbits(CBIT) + 20;
		while (--c >= 0 && i < NC) c_len[i++] = 0;
	    } else c_len[i++] = c - 2;
	}
	while (i < NC) c_len[i++] = 0;

	    if (bitbuf & mask) j = right[j];
	    else               j = left [j];
	    mask >>= 1;
	} while (j >= NC && (mask || j != left[j]));
    }
    fillbuf((int) c_len[j]);
    return j;

	    if (bitbuf & mask) j = right[j];
	    else               j = left [j];
	    mask >>= 1;
	} while (j >= NP && (mask || j != left[j]));
    }
    fillbuf((int) pt_len[j]);
    if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));

    while (--j >= 0) {
	buffer[r] = buffer[i];
	i = (i + 1) & (DICSIZ - 1);
	if (++r >= count) return r;
    }
    for ( ; ; ) {
	c = decode_c();

	}
	if (c <= UCHAR_MAX) {
	    buffer[r] = c;
	    if (++r >= count) return r;
	} else {
	    j = c - (UCHAR_MAX + 1 - THRESHOLD);
	    i = (r - decode_p() - 1) & (DICSIZ - 1);
	    while (--j >= 0) {
		buffer[r] = buffer[i];
		i = (i + 1) & (DICSIZ - 1);
		if (++r >= count) return r;
	    }
	}
    }




#include "gzip.h"
#include "crypt.h"

#define MIN(a,b) ((a) <= (b) ? (a) : (b))
/* The arguments must not have side effects. */

#define MAX_BITLEN 25

	/* Remember where the literals of this length start in literal[] : */
	lit_base[len] = base;
	/* And read the literals: */
	for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
	    literal[base++] = (uch)get_byte();
	}
    }

    prefixp = &prefix_len[1<<peek_bits];
    for (len = 1; len <= peek_bits; len++) {
	int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
	while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
    }
    /* The length of all other codes is unknown: */
    while (prefixp > prefix_len) *--prefixp = 0;

Return to bug 145511

Lines 149-161 Link Here

(-)gzip-1.3.5.orig/unlzh.c (-16 / +20 lines)
149	unsigned i, k, len, ch, jutbits, avail, nextcode, mask;	149	unsigned i, k, len, ch, jutbits, avail, nextcode, mask;
150		150
151	for (i = 1; i <= 16; i++) count[i] = 0;	151	for (i = 1; i <= 16; i++) count[i] = 0;
152	for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++;	152	for (i = 0; i < (unsigned)nchar; i++) {
		153	if (bitlen[i] > 16)
		154	error("Bad table (case a)\n");
		155	else count[bitlen[i]]++;
		156	}
153		157
154	start[1] = 0;	158	start[1] = 0;
155	for (i = 1; i <= 16; i++)	159	for (i = 1; i <= 16; i++)
156	start[i + 1] = start[i] + (count[i] << (16 - i));	160	start[i + 1] = start[i] + (count[i] << (16 - i));
157	if ((start[17] & 0xffff) != 0)	161	if ((start[17] & 0xffff) != 0 \|\| tablebits > 16) /* 16 for weight below */
158	error("Bad table\n");	162	error("Bad table (case b)\n");
159		163
160	jutbits = 16 - tablebits;	164	jutbits = 16 - tablebits;
161	for (i = 1; i <= (unsigned)tablebits; i++) {	165	for (i = 1; i <= (unsigned)tablebits; i++) {
Lines 169-183 Link Here
169		173
170	i = start[tablebits + 1] >> jutbits;	174	i = start[tablebits + 1] >> jutbits;
171	if (i != 0) {	175	if (i != 0) {
172	k = 1 << tablebits;	176	k = MIN(1 << tablebits, DIST_BUFSIZE);
173	while (i != k) table[i++] = 0;	177	while (i < k) table[i++] = 0;
174	}	178	}
175		179
176	avail = nchar;	180	avail = nchar;
177	mask = (unsigned) 1 << (15 - tablebits);	181	mask = (unsigned) 1 << (15 - tablebits);
178	for (ch = 0; ch < (unsigned)nchar; ch++) {	182	for (ch = 0; ch < (unsigned)nchar; ch++) {
179	if ((len = bitlen[ch]) == 0) continue;	183	if ((len = bitlen[ch]) == 0) continue;
180	nextcode = start[len] + weight[len];	184	nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE);
181	if (len <= (unsigned)tablebits) {	185	if (len <= (unsigned)tablebits) {
182	for (i = start[len]; i < nextcode; i++) table[i] = ch;	186	for (i = start[len]; i < nextcode; i++) table[i] = ch;
183	} else {	187	} else {
Lines 218-224 Link Here
218	for (i = 0; i < 256; i++) pt_table[i] = c;	222	for (i = 0; i < 256; i++) pt_table[i] = c;
219	} else {	223	} else {
220	i = 0;	224	i = 0;
221	while (i < n) {	225	while (i < MIN(n,NPT)) {
222	c = bitbuf >> (BITBUFSIZ - 3);	226	c = bitbuf >> (BITBUFSIZ - 3);
223	if (c == 7) {	227	if (c == 7) {
224	mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);	228	mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
Lines 228-234 Link Here
228	pt_len[i++] = c;	232	pt_len[i++] = c;
229	if (i == i_special) {	233	if (i == i_special) {
230	c = getbits(2);	234	c = getbits(2);
231	while (--c >= 0) pt_len[i++] = 0;	235	while (--c >= 0 && i < NPT) pt_len[i++] = 0;
232	}	236	}
233	}	237	}
234	while (i < nn) pt_len[i++] = 0;	238	while (i < nn) pt_len[i++] = 0;
Lines 248-254 Link Here
248	for (i = 0; i < 4096; i++) c_table[i] = c;	252	for (i = 0; i < 4096; i++) c_table[i] = c;
249	} else {	253	} else {
250	i = 0;	254	i = 0;
251	while (i < n) {	255	while (i < MIN(n,NC)) {
252	c = pt_table[bitbuf >> (BITBUFSIZ - 8)];	256	c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
253	if (c >= NT) {	257	if (c >= NT) {
254	mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);	258	mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
Lines 256-269 Link Here
256	if (bitbuf & mask) c = right[c];	260	if (bitbuf & mask) c = right[c];
257	else c = left [c];	261	else c = left [c];
258	mask >>= 1;	262	mask >>= 1;
259	} while (c >= NT);	263	} while (c >= NT && (mask \|\| c != left[c]));
260	}	264	}
261	fillbuf((int) pt_len[c]);	265	fillbuf((int) pt_len[c]);
262	if (c <= 2) {	266	if (c <= 2) {
263	if (c == 0) c = 1;	267	if (c == 0) c = 1;
264	else if (c == 1) c = getbits(4) + 3;	268	else if (c == 1) c = getbits(4) + 3;
265	else c = getbits(CBIT) + 20;	269	else c = getbits(CBIT) + 20;
266	while (--c >= 0) c_len[i++] = 0;	270	while (--c >= 0 && i < NC) c_len[i++] = 0;
267	} else c_len[i++] = c - 2;	271	} else c_len[i++] = c - 2;
268	}	272	}
269	while (i < NC) c_len[i++] = 0;	273	while (i < NC) c_len[i++] = 0;
Lines 292-298 Link Here
292	if (bitbuf & mask) j = right[j];	296	if (bitbuf & mask) j = right[j];
293	else j = left [j];	297	else j = left [j];
294	mask >>= 1;	298	mask >>= 1;
295	} while (j >= NC);	299	} while (j >= NC && (mask \|\| j != left[j]));
296	}	300	}
297	fillbuf((int) c_len[j]);	301	fillbuf((int) c_len[j]);
298	return j;	302	return j;
Lines 309-315 Link Here
309	if (bitbuf & mask) j = right[j];	313	if (bitbuf & mask) j = right[j];
310	else j = left [j];	314	else j = left [j];
311	mask >>= 1;	315	mask >>= 1;
312	} while (j >= NP);	316	} while (j >= NP && (mask \|\| j != left[j]));
313	}	317	}
314	fillbuf((int) pt_len[j]);	318	fillbuf((int) pt_len[j]);
315	if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));	319	if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));
Lines 356-362 Link Here
356	while (--j >= 0) {	360	while (--j >= 0) {
357	buffer[r] = buffer[i];	361	buffer[r] = buffer[i];
358	i = (i + 1) & (DICSIZ - 1);	362	i = (i + 1) & (DICSIZ - 1);
359	if (++r == count) return r;	363	if (++r >= count) return r;
360	}	364	}
361	for ( ; ; ) {	365	for ( ; ; ) {
362	c = decode_c();	366	c = decode_c();
Lines 366-379 Link Here
366	}	370	}
367	if (c <= UCHAR_MAX) {	371	if (c <= UCHAR_MAX) {
368	buffer[r] = c;	372	buffer[r] = c;
369	if (++r == count) return r;	373	if (++r >= count) return r;
370	} else {	374	} else {
371	j = c - (UCHAR_MAX + 1 - THRESHOLD);	375	j = c - (UCHAR_MAX + 1 - THRESHOLD);
372	i = (r - decode_p() - 1) & (DICSIZ - 1);	376	i = (r - decode_p() - 1) & (DICSIZ - 1);
373	while (--j >= 0) {	377	while (--j >= 0) {
374	buffer[r] = buffer[i];	378	buffer[r] = buffer[i];
375	i = (i + 1) & (DICSIZ - 1);	379	i = (i + 1) & (DICSIZ - 1);
376	if (++r == count) return r;	380	if (++r >= count) return r;
377	}	381	}
378	}	382	}
379	}	383	}

Lines 13-19 Link Here

(-)gzip-1.3.5.orig/unpack.c (-3 / +2 lines)
13	#include "gzip.h"	13	#include "gzip.h"
14	#include "crypt.h"	14	#include "crypt.h"
15		15
16	#define MIN(a,b) ((a) <= (b) ? (a) : (b))
17	/* The arguments must not have side effects. */	16	/* The arguments must not have side effects. */
18		17
19	#define MAX_BITLEN 25	18	#define MAX_BITLEN 25
Lines 133-139 Link Here
133	/* Remember where the literals of this length start in literal[] : */	132	/* Remember where the literals of this length start in literal[] : */
134	lit_base[len] = base;	133	lit_base[len] = base;
135	/* And read the literals: */	134	/* And read the literals: */
136	for (n = leaves[len]; n > 0; n--) {	135	for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
137	literal[base++] = (uch)get_byte();	136	literal[base++] = (uch)get_byte();
138	}	137	}
139	}	138	}
Lines 169-175 Link Here
169	prefixp = &prefix_len[1<<peek_bits];	168	prefixp = &prefix_len[1<<peek_bits];
170	for (len = 1; len <= peek_bits; len++) {	169	for (len = 1; len <= peek_bits; len++) {
171	int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */	170	int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
172	while (prefixes--) *--prefixp = (uch)len;	171	while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
173	}	172	}
174	/* The length of all other codes is unknown: */	173	/* The length of all other codes is unknown: */
175	while (prefixp > prefix_len) *--prefixp = 0;	174	while (prefixp > prefix_len) *--prefixp = 0;