summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-01-18 21:48:36 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-01-18 21:48:36 +0000
commit80c89a0bd4283e8268bd9ad6e434a1079a2e2f71 (patch)
tree6ef80674e224abccd376d56c2256b2f3576330a8 /sys/net
parent065be7af7bf8303ae6746863aed2c5399ea42327 (diff)
Fix some zlib memory leaks, originally from Mark Adler
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/zlib.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 1a21e49fb74..682302a928e 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zlib.c,v 1.9 2001/01/29 06:12:11 mickey Exp $ */
+/* $OpenBSD: zlib.c,v 1.10 2002/01/18 21:48:35 millert Exp $ */
/* $NetBSD: zlib.c,v 1.2 1996/03/16 23:55:40 christos Exp $ */
/*
@@ -3405,7 +3405,10 @@ int r;
{
r = t;
if (r == Z_DATA_ERROR)
+ {
+ ZFREE(z, s->sub.trees.blens, s->sub.trees.nblens * sizeof(uInt));
s->mode = BADB;
+ }
LEAVE
}
s->sub.trees.index = 0;
@@ -3468,7 +3471,10 @@ int r;
if (t != Z_OK)
{
if (t == (uInt)Z_DATA_ERROR)
+ {
+ ZFREE(z, s->sub.trees.blens, s->sub.trees.nblens * sizeof(uInt));
s->mode = BADB;
+ }
r = t;
LEAVE
}
@@ -3480,11 +3486,11 @@ int r;
r = Z_MEM_ERROR;
LEAVE
}
- ZFREE(z, s->sub.trees.blens, s->sub.trees.nblens * sizeof(uInt));
s->sub.decode.codes = c;
s->sub.decode.tl = tl;
s->sub.decode.td = td;
}
+ ZFREE(z, s->sub.trees.blens, s->sub.trees.nblens * sizeof(uInt));
s->mode = CODES;
case CODES:
UPDATE