]>
Commit | Line | Data |
---|---|---|
672596d9 KT |
1 | diff -urN linux-2.2.21-pre4/drivers/net/zlib.c linux-2.2.21-rc1/drivers/net/zlib.c |
2 | --- linux-2.2.21-pre4/drivers/net/zlib.c Sun Mar 25 08:31:20 2001 | |
3 | +++ linux-2.2.21-rc1/drivers/net/zlib.c Tue Mar 12 04:35:09 2002 | |
4 | @@ -3860,10 +3860,11 @@ | |
5 | &s->sub.trees.tb, z); | |
6 | if (t != Z_OK) | |
7 | { | |
8 | - ZFREE(z, s->sub.trees.blens); | |
9 | r = t; | |
10 | - if (r == Z_DATA_ERROR) | |
11 | + if (r == Z_DATA_ERROR) { | |
12 | s->mode = BADB; | |
13 | + ZFREE(z, s->sub.trees.blens); | |
14 | + } | |
15 | LEAVE | |
16 | } | |
17 | s->sub.trees.index = 0; | |
18 | @@ -3928,14 +3929,16 @@ | |
19 | #endif | |
20 | t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), | |
21 | s->sub.trees.blens, &bl, &bd, &tl, &td, z); | |
22 | - ZFREE(z, s->sub.trees.blens); | |
23 | if (t != Z_OK) | |
24 | { | |
25 | - if (t == (uInt)Z_DATA_ERROR) | |
26 | + if (t == (uInt)Z_DATA_ERROR) { | |
27 | s->mode = BADB; | |
28 | + ZFREE(z, s->sub.trees.blens); | |
29 | + } | |
30 | r = t; | |
31 | LEAVE | |
32 | } | |
33 | + ZFREE(z, s->sub.trees.blens); | |
34 | Tracev((stderr, "inflate: trees ok, %d * %d bytes used\n", | |
35 | inflate_hufts, sizeof(inflate_huft))); | |
36 | if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL) |