emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[g]unzip: fix recent breakage.

Browse Source 
Also, do emit error message we so painstakingly pass from gzip internals

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2015-10-30 23:41:53 +01:00
parent 95650a86d1
commit 6bd3fff51a
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
archival/libarchive/decompress_gunzip.c
View File

@ -309,8 +309,7 @@ static int huft_build(const unsigned *b, const unsigned n,
huft_t *q; /* points to current table */ huft_t *q; /* points to current table */
huft_t r; /* table entry for structure assignment */ huft_t r; /* table entry for structure assignment */
huft_t *u[BMAX]; /* table stack */ huft_t *u[BMAX]; /* table stack */
unsigned v[N_MAX]; /* values in order of bit length */ unsigned v[N_MAX + 1]; /* values in order of bit length. last v[] is never used */
unsigned v_end;
int ws[BMAX + 1]; /* bits decoded stack */ int ws[BMAX + 1]; /* bits decoded stack */
int w; /* bits decoded */ int w; /* bits decoded */
unsigned x[BMAX + 1]; /* bit offsets, then code stack */ unsigned x[BMAX + 1]; /* bit offsets, then code stack */
@ -365,15 +364,17 @@ static int huft_build(const unsigned *b, const unsigned n,
*xp++ = j; *xp++ = j;
} }
/* Make a table of values in order of bit lengths */ /* Make a table of values in order of bit lengths.
* To detect bad input, unused v[i]'s are set to invalid value UINT_MAX.
* In particular, last v[i] is never filled and must not be accessed.
*/
memset(v, 0xff, sizeof(v));
p = b; p = b;
i = 0; i = 0;
v_end = 0;
do { do {
j = *p++; j = *p++;
if (j != 0) { if (j != 0) {
v[x[j]++] = i; v[x[j]++] = i;
v_end = x[j];
} }
} while (++i < n); } while (++i < n);
@ -435,7 +436,9 @@ static int huft_build(const unsigned *b, const unsigned n,
/* set up table entry in r */ /* set up table entry in r */
r.b = (unsigned char) (k - w); r.b = (unsigned char) (k - w);
if (p >= v + v_end) { // Was "if (p >= v + n)" but v[] can be shorter! if (/*p >= v + n || -- redundant, caught by the second check: */
*p == UINT_MAX /* do we access uninited v[i]? (see memset(v))*/
) {
r.e = 99; /* out of values--invalid code */ r.e = 99; /* out of values--invalid code */
} else if (*p < s) { } else if (*p < s) {
r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is EOB code */ r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is EOB code */
@ -520,8 +523,9 @@ static NOINLINE int inflate_codes(STATE_PARAM_ONLY)
e = t->e; e = t->e;
if (e > 16) if (e > 16)
do { do {
if (e == 99) if (e == 99) {
abort_unzip(PASS_STATE_ONLY);; abort_unzip(PASS_STATE_ONLY);
}
bb >>= t->b; bb >>= t->b;
k -= t->b; k -= t->b;
e -= 16; e -= 16;
@ -557,8 +561,9 @@ static NOINLINE int inflate_codes(STATE_PARAM_ONLY)
e = t->e; e = t->e;
if (e > 16) if (e > 16)
do { do {
if (e == 99) if (e == 99) {
abort_unzip(PASS_STATE_ONLY); abort_unzip(PASS_STATE_ONLY);
}
bb >>= t->b; bb >>= t->b;
k -= t->b; k -= t->b;
e -= 16; e -= 16;
@ -824,8 +829,9 @@ static int inflate_block(STATE_PARAM smallint *e)
b_dynamic >>= 4; b_dynamic >>= 4;
k_dynamic -= 4; k_dynamic -= 4;
if (nl > 286 || nd > 30) if (nl > 286 || nd > 30) {
abort_unzip(PASS_STATE_ONLY); /* bad lengths */ abort_unzip(PASS_STATE_ONLY); /* bad lengths */
}
/* read in bit-length-code lengths */ /* read in bit-length-code lengths */
for (j = 0; j < nb; j++) { for (j = 0; j < nb; j++) {
@ -906,12 +912,14 @@ static int inflate_block(STATE_PARAM smallint *e)
bl = lbits; bl = lbits;
i = huft_build(ll, nl, 257, cplens, cplext, &inflate_codes_tl, &bl); i = huft_build(ll, nl, 257, cplens, cplext, &inflate_codes_tl, &bl);
if (i != 0) if (i != 0) {
abort_unzip(PASS_STATE_ONLY); abort_unzip(PASS_STATE_ONLY);
}
bd = dbits; bd = dbits;
i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &inflate_codes_td, &bd); i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &inflate_codes_td, &bd);
if (i != 0) if (i != 0) {
abort_unzip(PASS_STATE_ONLY); abort_unzip(PASS_STATE_ONLY);
}
/* set up data for inflate_codes() */ /* set up data for inflate_codes() */
inflate_codes_setup(PASS_STATE bl, bd); inflate_codes_setup(PASS_STATE bl, bd);
@ -999,6 +1007,7 @@ inflate_unzip_internal(STATE_PARAM transformer_state_t *xstate)
error_msg = "corrupted data"; error_msg = "corrupted data";
if (setjmp(error_jmp)) { if (setjmp(error_jmp)) {
/* Error from deep inside zip machinery */ /* Error from deep inside zip machinery */
bb_error_msg(error_msg);
n = -1; n = -1;
goto ret; goto ret;
} }

1
testsuite/unzip.tests
View File

@ -34,6 +34,7 @@ rm foo.zip
testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \ testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \
"Archive: bad.zip "Archive: bad.zip
inflating: ]3j½r«IK-%Ix inflating: ]3j½r«IK-%Ix
unzip: corrupted data
unzip: inflate error unzip: inflate error
1 1
" \ " \