diff options
| author | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2002-02-17 17:35:18 +0000 |
|---|---|---|
| committer | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2002-02-17 17:35:18 +0000 |
| commit | efec00ac60f975859053df788c28daa2eb282124 (patch) | |
| tree | 797710a022c855aa7bdf1d47f325c2ec502f2a8e | |
| parent | 9e9c4443f66d6b6b00a40081f01d826908c1cd09 (diff) | |
Notes
| -rw-r--r-- | lib/libz/infblock.c | 11 | ||||
| -rw-r--r-- | sys/net/zlib.c | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lib/libz/infblock.c b/lib/libz/infblock.c index c46858c8a239..f2cd3c96123d 100644 --- a/lib/libz/infblock.c +++ b/lib/libz/infblock.c @@ -252,10 +252,11 @@ 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) + if (r == Z_DATA_ERROR) { + ZFREE(z, s->sub.trees.blens); s->mode = BAD; + } LEAVE } s->sub.trees.index = 0; @@ -316,11 +317,12 @@ 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) + if (t == (uInt)Z_DATA_ERROR) { + ZFREE(z, s->sub.trees.blens); s->mode = BAD; + } r = t; LEAVE } @@ -332,6 +334,7 @@ int r; } s->sub.decode.codes = c; } + ZFREE(z, s->sub.trees.blens); s->mode = CODES; case CODES: UPDATE diff --git a/sys/net/zlib.c b/sys/net/zlib.c index 19df8590db24..bf1f72dae344 100644 --- a/sys/net/zlib.c +++ b/sys/net/zlib.c @@ -3864,10 +3864,11 @@ int r; &s->sub.trees.tb, z); if (t != Z_OK) { - ZFREE(z, s->sub.trees.blens); r = t; - if (r == Z_DATA_ERROR) + if (r == Z_DATA_ERROR) { + ZFREE(z, s->sub.trees.blens); s->mode = BADB; + } LEAVE } s->sub.trees.index = 0; @@ -3932,11 +3933,12 @@ 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) + if (t == (uInt)Z_DATA_ERROR) { + ZFREE(z, s->sub.trees.blens); s->mode = BADB; + } r = t; LEAVE } @@ -3953,6 +3955,7 @@ int r; s->sub.decode.tl = tl; s->sub.decode.td = td; } + ZFREE(z, s->sub.trees.blens); s->mode = CODES; case CODES: UPDATE |