aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2001-07-11 07:25:01 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2001-07-11 07:25:01 +0000
commit93febe672a943ed1cb4391fa451c3721e1498335 (patch)
tree241ea6e4e8a752cb32bfbb18628ec7aff349e486
parentc59fa37d4083861a5766da71e4d905565479f7a2 (diff)
downloadbusybox-93febe672a943ed1cb4391fa451c3721e1498335.tar.gz
free coniditionally, just to make it play nice with dmalloc which is incompatable with standard free()
-rw-r--r--archival/libunarchive/decompress_unzip.c8
-rw-r--r--archival/libunarchive/unzip.c8
-rw-r--r--libbb/unzip.c8
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)
if (waitpid(gunzip_pid, NULL, 0) == -1) {
printf("Couldnt wait ?");
}
- free(window);
- free(crc_table);
+ if (window) {
+ free(window);
+ }
+ if (crc_table) {
+ free(crc_table);
+ }
}
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)
if (waitpid(gunzip_pid, NULL, 0) == -1) {
printf("Couldnt wait ?");
}
- free(window);
- free(crc_table);
+ if (window) {
+ free(window);
+ }
+ if (crc_table) {
+ free(crc_table);
+ }
}
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)
if (waitpid(gunzip_pid, NULL, 0) == -1) {
printf("Couldnt wait ?");
}
- free(window);
- free(crc_table);
+ if (window) {
+ free(window);
+ }
+ if (crc_table) {
+ free(crc_table);
+ }
}