Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9e95e92
)
Merge zlib double-free bug forwarded by Mark J Cox.
author
Martin Pool
<mbp@samba.org>
Mon, 11 Mar 2002 05:55:33 +0000
(
05:55
+0000)
committer
Martin Pool
<mbp@samba.org>
Mon, 11 Mar 2002 05:55:33 +0000
(
05:55
+0000)
zlib/infblock.c
patch
|
blob
|
blame
|
history
diff --git
a/zlib/infblock.c
b/zlib/infblock.c
index
1c221dd
..
58f0628
100644
(file)
--- a/
zlib/infblock.c
+++ b/
zlib/infblock.c
@@
-249,10
+249,12
@@
int r;
&s->sub.trees.tb, s->hufts, z);
if (t != Z_OK)
{
&s->sub.trees.tb, s->hufts, z);
if (t != Z_OK)
{
- ZFREE(z, s->sub.trees.blens);
r = t;
if (r == Z_DATA_ERROR)
r = t;
if (r == Z_DATA_ERROR)
- s->mode = zBAD;
+ {
+ ZFREE(z, s->sub.trees.blens);
+ s->mode = zBAD;
+ }
LEAVE
}
s->sub.trees.index = 0;
LEAVE
}
s->sub.trees.index = 0;
@@
-317,10
+319,14
@@
int r;
if (t != Z_OK)
{
if (t == (uInt)Z_DATA_ERROR)
if (t != Z_OK)
{
if (t == (uInt)Z_DATA_ERROR)
- s->mode = zBAD;
+ {
+ ZFREE(z, s->sub.trees.blens);
+ s->mode = zBAD;
+ }
r = t;
LEAVE
}
r = t;
LEAVE
}
+ ZFREE(z, s->sub.trees.blens);
Tracev((stderr, "inflate: trees ok\n"));
if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
{
Tracev((stderr, "inflate: trees ok\n"));
if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
{