diff options
author | green <green@FreeBSD.org> | 2002-03-11 22:36:26 +0000 |
---|---|---|
committer | green <green@FreeBSD.org> | 2002-03-11 22:36:26 +0000 |
commit | 7ca574f59c0cfa1c18dfad38e2695df7c5356ccd (patch) | |
tree | bff2461c1653758bf9b8443f106c8627f9369418 /lib/libz/infblock.c | |
parent | 08dc078a21e50f8bfdb56683ae019a8081cf84b5 (diff) | |
download | FreeBSD-src-7ca574f59c0cfa1c18dfad38e2695df7c5356ccd.zip FreeBSD-src-7ca574f59c0cfa1c18dfad38e2695df7c5356ccd.tar.gz |
Fix conflicts.
Diffstat (limited to 'lib/libz/infblock.c')
-rw-r--r-- | lib/libz/infblock.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/libz/infblock.c b/lib/libz/infblock.c index f2cd3c9..ac10995 100644 --- a/lib/libz/infblock.c +++ b/lib/libz/infblock.c @@ -1,5 +1,5 @@ /* infblock.c -- interpret and process block types to last block - * Copyright (C) 1995-1998 Mark Adler + * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -253,10 +253,11 @@ int r; if (t != Z_OK) { 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; @@ -319,10 +320,11 @@ int r; s->hufts, z); 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 } |