Merge the zlib fix properly; back out tridge's bandaid.

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)

diff --git a/zlib/zutil.c b/zlib/zutil.c
index 2aafdab..7fb0327 100644 (file)
--- a/zlib/zutil.c
+++ b/zlib/zutil.c
@@ -213,7 +213,7 @@ void  zcfree (opaque, ptr)
     voidpf opaque;
     voidpf ptr;
 {
-    if (ptr) free(ptr);
+    free(ptr);
     if (opaque) return; /* make compiler happy */
 }
 

diff --git a/zlib/zutil.h b/zlib/zutil.h
index fbf2a98..f1d583e 100644 (file)
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
@@ -217,7 +217,7 @@ void   zcfree  OF((voidpf opaque, voidpf ptr));
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  ((*((strm)->zfree))((strm)->opaque, (voidpf)(addr)),(addr)=NULL)
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
 #endif /* _Z_UTIL_H */