diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-11 22:11:18 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-11 22:11:18 +0000 |
commit | 8c16c8c7be08247db45d9fdc459058f148d1dcb9 (patch) | |
tree | f1412386f2b8672f1b5cfdf967e1abcd29d60ca9 /zlib/infblock.c | |
parent | 1fcf59fa4632a4b13bfb40efe6291df786d98926 (diff) | |
download | ppe42-gcc-8c16c8c7be08247db45d9fdc459058f148d1dcb9.tar.gz ppe42-gcc-8c16c8c7be08247db45d9fdc459058f148d1dcb9.zip |
* ChangeLog.gcj: Imported 1.1.4, while preserving local changes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50612 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib/infblock.c')
-rw-r--r-- | zlib/infblock.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/zlib/infblock.c b/zlib/infblock.c index f4920faa5ea..dd7a6d40a8d 100644 --- a/zlib/infblock.c +++ b/zlib/infblock.c @@ -1,5 +1,5 @@ /* infblock.c -- interpret and process block types to last block - * Copyright (C) 1995-1998 Mark Adler + * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -249,10 +249,12 @@ int r; &s->sub.trees.tb, s->hufts, 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; @@ -313,11 +315,13 @@ int r; t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), s->sub.trees.blens, &bl, &bd, &tl, &td, s->hufts, 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 } @@ -329,6 +333,7 @@ int r; } s->sub.decode.codes = c; } + ZFREE(z, s->sub.trees.blens); s->mode = CODES; case CODES: UPDATE |