a quick fix for a segmentation fault in zlib I am getting whenever I

try to upload a file from rsync 2.5.2 to rsync 2.5.3

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

diff --git a/zlib/zutil.h b/zlib/zutil.h
index f1d583e4f39e396e0e3af0e205a1b79479ef6286..fbf2a98004fe530b8cd853ebd6c8c9878d562023 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))
+#define ZFREE(strm, addr)  ((*((strm)->zfree))((strm)->opaque, (voidpf)(addr)),(addr)=NULL)
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
 #endif /* _Z_UTIL_H */