diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2001-07-11 07:25:01 +0000 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2001-07-11 07:25:01 +0000 |
commit | 93febe672a943ed1cb4391fa451c3721e1498335 (patch) | |
tree | 241ea6e4e8a752cb32bfbb18628ec7aff349e486 | |
parent | c59fa37d4083861a5766da71e4d905565479f7a2 (diff) | |
download | busybox-w32-93febe672a943ed1cb4391fa451c3721e1498335.tar.gz busybox-w32-93febe672a943ed1cb4391fa451c3721e1498335.tar.bz2 busybox-w32-93febe672a943ed1cb4391fa451c3721e1498335.zip |
free coniditionally, just to make it play nice with dmalloc which is incompatable with standard free()
-rw-r--r-- | archival/libunarchive/decompress_unzip.c | 8 | ||||
-rw-r--r-- | archival/libunarchive/unzip.c | 8 | ||||
-rw-r--r-- | libbb/unzip.c | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index b85eb9981..23bf6c73c 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
@@ -1024,6 +1024,10 @@ extern void gz_close(int gunzip_pid) | |||
1024 | if (waitpid(gunzip_pid, NULL, 0) == -1) { | 1024 | if (waitpid(gunzip_pid, NULL, 0) == -1) { |
1025 | printf("Couldnt wait ?"); | 1025 | printf("Couldnt wait ?"); |
1026 | } | 1026 | } |
1027 | free(window); | 1027 | if (window) { |
1028 | free(crc_table); | 1028 | free(window); |
1029 | } | ||
1030 | if (crc_table) { | ||
1031 | free(crc_table); | ||
1032 | } | ||
1029 | } | 1033 | } |
diff --git a/archival/libunarchive/unzip.c b/archival/libunarchive/unzip.c index b85eb9981..23bf6c73c 100644 --- a/archival/libunarchive/unzip.c +++ b/archival/libunarchive/unzip.c | |||
@@ -1024,6 +1024,10 @@ extern void gz_close(int gunzip_pid) | |||
1024 | if (waitpid(gunzip_pid, NULL, 0) == -1) { | 1024 | if (waitpid(gunzip_pid, NULL, 0) == -1) { |
1025 | printf("Couldnt wait ?"); | 1025 | printf("Couldnt wait ?"); |
1026 | } | 1026 | } |
1027 | free(window); | 1027 | if (window) { |
1028 | free(crc_table); | 1028 | free(window); |
1029 | } | ||
1030 | if (crc_table) { | ||
1031 | free(crc_table); | ||
1032 | } | ||
1029 | } | 1033 | } |
diff --git a/libbb/unzip.c b/libbb/unzip.c index b85eb9981..23bf6c73c 100644 --- a/libbb/unzip.c +++ b/libbb/unzip.c | |||
@@ -1024,6 +1024,10 @@ extern void gz_close(int gunzip_pid) | |||
1024 | if (waitpid(gunzip_pid, NULL, 0) == -1) { | 1024 | if (waitpid(gunzip_pid, NULL, 0) == -1) { |
1025 | printf("Couldnt wait ?"); | 1025 | printf("Couldnt wait ?"); |
1026 | } | 1026 | } |
1027 | free(window); | 1027 | if (window) { |
1028 | free(crc_table); | 1028 | free(window); |
1029 | } | ||
1030 | if (crc_table) { | ||
1031 | free(crc_table); | ||
1032 | } | ||
1029 | } | 1033 | } |