Commit 68193047 authored by Andrew Tridgell's avatar Andrew Tridgell

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
parent a795ab99
...@@ -213,7 +213,7 @@ void zcfree (opaque, ptr) ...@@ -213,7 +213,7 @@ void zcfree (opaque, ptr)
voidpf opaque; voidpf opaque;
voidpf ptr; voidpf ptr;
{ {
free(ptr); if (ptr) free(ptr);
if (opaque) return; /* make compiler happy */ if (opaque) return; /* make compiler happy */
} }
......
...@@ -217,7 +217,7 @@ void zcfree OF((voidpf opaque, voidpf ptr)); ...@@ -217,7 +217,7 @@ void zcfree OF((voidpf opaque, voidpf ptr));
#define ZALLOC(strm, items, size) \ #define ZALLOC(strm, items, size) \
(*((strm)->zalloc))((strm)->opaque, (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);} #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
#endif /* _Z_UTIL_H */ #endif /* _Z_UTIL_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment