Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge the zlib fix properly; back out tridge's bandaid.
[rsync/rsync.git]
/
zlib
/
infblock.c
diff --git
a/zlib/infblock.c
b/zlib/infblock.c
index
58f0628
..
55e0eec
100644
(file)
--- a/
zlib/infblock.c
+++ b/
zlib/infblock.c
@@
-315,7
+315,6
@@
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)