diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-03-15 05:27:34 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-03-15 05:27:34 +0000 |
| commit | ddf5effa000987f4a9fe6c70a050db8e3fc53299 (patch) | |
| tree | 0950a61788054fc1b8dd429928dd10baa15a03fd | |
| parent | ee3188ab98dcbdd6265c8dd173fffdb0b0bde2dd (diff) | |
| download | nss-hg-ddf5effa000987f4a9fe6c70a050db8e3fc53299.tar.gz | |
The previous checkin breaks signtool on Linux, AIX, and OSF1. Backing it
out.
| -rw-r--r-- | security/nss/cmd/zlib/infblock.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/security/nss/cmd/zlib/infblock.c b/security/nss/cmd/zlib/infblock.c index 8cee831f6..8eddbafed 100644 --- a/security/nss/cmd/zlib/infblock.c +++ b/security/nss/cmd/zlib/infblock.c @@ -250,12 +250,10 @@ int r; &s->sub.trees.tb, z); if (t != Z_OK) { + ZFREE(z, s->sub.trees.blens); r = t; if (r == Z_DATA_ERROR) - { - ZFREE(z, s->sub.trees.blens); s->mode = BAD; - } LEAVE } s->sub.trees.index = 0; @@ -320,13 +318,11 @@ int r; #endif t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), s->sub.trees.blens, &bl, &bd, &tl, &td, z); + ZFREE(z, s->sub.trees.blens); if (t != Z_OK) { if (t == (uInt)Z_DATA_ERROR) - { - ZFREE(z, s->sub.trees.blens); s->mode = BAD; - } r = t; LEAVE } @@ -343,7 +339,6 @@ int r; s->sub.decode.tl = tl; s->sub.decode.td = td; } - ZFREE(z, s->sub.trees.blens); s->mode = CODES; case CODES: UPDATE |