diff options
| author | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-04-18 15:51:45 +0000 |
|---|---|---|
| committer | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-04-18 15:51:45 +0000 |
| commit | f1aa86228bc2c0a2f62d276b19a50de819c589ae (patch) | |
| tree | 5f2c270b682b9ca23b02cf41ae0a3d9dec1cf33f | |
| parent | 6c663e68e655251e7d759774d8bcae41632837db (diff) | |
| download | busybox-w32-f1aa86228bc2c0a2f62d276b19a50de819c589ae.tar.gz busybox-w32-f1aa86228bc2c0a2f62d276b19a50de819c589ae.tar.bz2 busybox-w32-f1aa86228bc2c0a2f62d276b19a50de819c589ae.zip | |
Eliminate a segfault when called on an existing file with out an extension:
touch foo && gunzip foo
git-svn-id: svn://busybox.net/trunk/busybox@2367 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | archival/gunzip.c | 4 | ||||
| -rw-r--r-- | gunzip.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c index c3960e953..65f435651 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c | |||
| @@ -158,9 +158,9 @@ extern int gunzip_main(int argc, char **argv) | |||
| 158 | 158 | ||
| 159 | delete_old_file = TRUE; | 159 | delete_old_file = TRUE; |
| 160 | extension = strrchr(if_name, '.'); | 160 | extension = strrchr(if_name, '.'); |
| 161 | if (strcmp(extension, ".gz") == 0) { | 161 | if (extension && strcmp(extension, ".gz") == 0) { |
| 162 | length -= 3; | 162 | length -= 3; |
| 163 | } else if (strcmp(extension, ".tgz") == 0) { | 163 | } else if (extension && strcmp(extension, ".tgz") == 0) { |
| 164 | length -= 4; | 164 | length -= 4; |
| 165 | } else { | 165 | } else { |
| 166 | error_msg_and_die("Invalid extension"); | 166 | error_msg_and_die("Invalid extension"); |
| @@ -158,9 +158,9 @@ extern int gunzip_main(int argc, char **argv) | |||
| 158 | 158 | ||
| 159 | delete_old_file = TRUE; | 159 | delete_old_file = TRUE; |
| 160 | extension = strrchr(if_name, '.'); | 160 | extension = strrchr(if_name, '.'); |
| 161 | if (strcmp(extension, ".gz") == 0) { | 161 | if (extension && strcmp(extension, ".gz") == 0) { |
| 162 | length -= 3; | 162 | length -= 3; |
| 163 | } else if (strcmp(extension, ".tgz") == 0) { | 163 | } else if (extension && strcmp(extension, ".tgz") == 0) { |
| 164 | length -= 4; | 164 | length -= 4; |
| 165 | } else { | 165 | } else { |
| 166 | error_msg_and_die("Invalid extension"); | 166 | error_msg_and_die("Invalid extension"); |