| blob | 2fff5990a5b3f8bab958254139c29892fa515ec7 |
1 Only in gzip-1.3.5: cscope.out
2 diff -ru gzip-1.3.5.orig/gzip.h gzip-1.3.5/gzip.h
3 --- gzip-1.3.5.orig/gzip.h 2001-10-01 07:53:41.000000000 +0100
4 +++ gzip-1.3.5/gzip.h 2006-08-18 22:44:38.755598000 +0100
5 @@ -198,6 +198,8 @@
6 extern int to_stdout; /* output to stdout (-c) */
7 extern int save_orig_name; /* set if original name must be saved */
9 +#define MIN(a,b) ((a) <= (b) ? (a) : (b))
10 +
11 #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
12 #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
14 diff -ru gzip-1.3.5.orig/inflate.c gzip-1.3.5/inflate.c
15 --- gzip-1.3.5.orig/inflate.c 2002-09-25 22:20:13.000000000 +0100
16 +++ gzip-1.3.5/inflate.c 2006-07-21 09:10:43.350376000 +0100
17 @@ -337,7 +337,7 @@
18 {
19 *t = (struct huft *)NULL;
20 *m = 0;
21 - return 0;
22 + return 2;
23 }
26 Only in gzip-1.3.5: testcases
27 diff -ru gzip-1.3.5.orig/unlzh.c gzip-1.3.5/unlzh.c
28 --- gzip-1.3.5.orig/unlzh.c 1999-10-06 06:00:00.000000000 +0100
29 +++ gzip-1.3.5/unlzh.c 2006-08-18 22:56:19.446997000 +0100
30 @@ -149,13 +149,17 @@
31 unsigned i, k, len, ch, jutbits, avail, nextcode, mask;
33 for (i = 1; i <= 16; i++) count[i] = 0;
34 - for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++;
35 + for (i = 0; i < (unsigned)nchar; i++) {
36 + if (bitlen[i] > 16)
37 + error("Bad table (case a)\n");
38 + else count[bitlen[i]]++;
39 + }
41 start[1] = 0;
42 for (i = 1; i <= 16; i++)
43 start[i + 1] = start[i] + (count[i] << (16 - i));
44 - if ((start[17] & 0xffff) != 0)
45 - error("Bad table\n");
46 + if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
47 + error("Bad table (case b)\n");
49 jutbits = 16 - tablebits;
50 for (i = 1; i <= (unsigned)tablebits; i++) {
51 @@ -169,15 +173,15 @@
53 i = start[tablebits + 1] >> jutbits;
54 if (i != 0) {
55 - k = 1 << tablebits;
56 - while (i != k) table[i++] = 0;
57 + k = MIN(1 << tablebits, DIST_BUFSIZE);
58 + while (i < k) table[i++] = 0;
59 }
61 avail = nchar;
62 mask = (unsigned) 1 << (15 - tablebits);
63 for (ch = 0; ch < (unsigned)nchar; ch++) {
64 if ((len = bitlen[ch]) == 0) continue;
65 - nextcode = start[len] + weight[len];
66 + nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE);
67 if (len <= (unsigned)tablebits) {
68 for (i = start[len]; i < nextcode; i++) table[i] = ch;
69 } else {
70 @@ -218,7 +222,7 @@
71 for (i = 0; i < 256; i++) pt_table[i] = c;
72 } else {
73 i = 0;
74 - while (i < n) {
75 + while (i < MIN(n,NPT)) {
76 c = bitbuf >> (BITBUFSIZ - 3);
77 if (c == 7) {
78 mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
79 @@ -228,7 +232,7 @@
80 pt_len[i++] = c;
81 if (i == i_special) {
82 c = getbits(2);
83 - while (--c >= 0) pt_len[i++] = 0;
84 + while (--c >= 0 && i < NPT) pt_len[i++] = 0;
85 }
86 }
87 while (i < nn) pt_len[i++] = 0;
88 @@ -248,7 +252,7 @@
89 for (i = 0; i < 4096; i++) c_table[i] = c;
90 } else {
91 i = 0;
92 - while (i < n) {
93 + while (i < MIN(n,NC)) {
94 c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
95 if (c >= NT) {
96 mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
97 @@ -256,14 +260,14 @@
98 if (bitbuf & mask) c = right[c];
99 else c = left [c];
100 mask >>= 1;
101 - } while (c >= NT);
102 + } while (c >= NT && (mask || c != left[c]));
103 }
104 fillbuf((int) pt_len[c]);
105 if (c <= 2) {
106 if (c == 0) c = 1;
107 else if (c == 1) c = getbits(4) + 3;
108 else c = getbits(CBIT) + 20;
109 - while (--c >= 0) c_len[i++] = 0;
110 + while (--c >= 0 && i < NC) c_len[i++] = 0;
111 } else c_len[i++] = c - 2;
112 }
113 while (i < NC) c_len[i++] = 0;
114 @@ -292,7 +296,7 @@
115 if (bitbuf & mask) j = right[j];
116 else j = left [j];
117 mask >>= 1;
118 - } while (j >= NC);
119 + } while (j >= NC && (mask || j != left[j]));
120 }
121 fillbuf((int) c_len[j]);
122 return j;
123 @@ -309,7 +313,7 @@
124 if (bitbuf & mask) j = right[j];
125 else j = left [j];
126 mask >>= 1;
127 - } while (j >= NP);
128 + } while (j >= NP && (mask || j != left[j]));
129 }
130 fillbuf((int) pt_len[j]);
131 if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));
132 @@ -356,7 +360,7 @@
133 while (--j >= 0) {
134 buffer[r] = buffer[i];
135 i = (i + 1) & (DICSIZ - 1);
136 - if (++r == count) return r;
137 + if (++r >= count) return r;
138 }
139 for ( ; ; ) {
140 c = decode_c();
141 @@ -366,14 +370,14 @@
142 }
143 if (c <= UCHAR_MAX) {
144 buffer[r] = c;
145 - if (++r == count) return r;
146 + if (++r >= count) return r;
147 } else {
148 j = c - (UCHAR_MAX + 1 - THRESHOLD);
149 i = (r - decode_p() - 1) & (DICSIZ - 1);
150 while (--j >= 0) {
151 buffer[r] = buffer[i];
152 i = (i + 1) & (DICSIZ - 1);
153 - if (++r == count) return r;
154 + if (++r >= count) return r;
155 }
156 }
157 }
158 diff -ru gzip-1.3.5.orig/unpack.c gzip-1.3.5/unpack.c
159 --- gzip-1.3.5.orig/unpack.c 1999-10-06 06:00:00.000000000 +0100
160 +++ gzip-1.3.5/unpack.c 2006-07-21 15:49:48.615190000 +0100
161 @@ -13,7 +13,6 @@
162 #include "gzip.h"
163 #include "crypt.h"
165 -#define MIN(a,b) ((a) <= (b) ? (a) : (b))
166 /* The arguments must not have side effects. */
168 #define MAX_BITLEN 25
169 @@ -133,7 +132,7 @@
170 /* Remember where the literals of this length start in literal[] : */
171 lit_base[len] = base;
172 /* And read the literals: */
173 - for (n = leaves[len]; n > 0; n--) {
174 + for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
175 literal[base++] = (uch)get_byte();
176 }
177 }
178 @@ -169,7 +168,7 @@
179 prefixp = &prefix_len[1<<peek_bits];
180 for (len = 1; len <= peek_bits; len++) {
181 int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
182 - while (prefixes--) *--prefixp = (uch)len;
183 + while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
184 }
185 /* The length of all other codes is unknown: */
186 while (prefixp > prefix_len) *--prefixp = 0;