diff options
| author | Matt Kraai | 2001-10-12 19:00:15 +0000 |
|---|---|---|
| committer | Matt Kraai | 2001-10-12 19:00:15 +0000 |
| commit | f86bbfaddd5803a173d51e41f18af9310f7a612c (patch) | |
| tree | 791f4ff12dd1f384c9567eea16421af06f7bdac2 | |
| parent | 9b2589dafde8efc5327e597690c84bfbfe42d53f (diff) | |
| download | busybox-f86bbfaddd5803a173d51e41f18af9310f7a612c.zip busybox-f86bbfaddd5803a173d51e41f18af9310f7a612c.tar.gz | |
Fix tar segfault when include list is empty and exclude list is not.
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | archival/tar.c | 9 | ||||
| -rw-r--r-- | tar.c | 9 |
3 files changed, 14 insertions, 6 deletions
@@ -20,6 +20,8 @@ -- Fix sed s/[/]// handling (closes: #1208). -- Fix `-/bin/sh' invocation (closes: #1209). -- Fix ash exec (noted by Arne Bernin). + -- Fix tar segfault when include list is empty and exclude list is + not. * Magick -- made init run inittab command's in the order they show up in the inittab file (FIFO instead of LIFO). diff --git a/archival/tar.c b/archival/tar.c index cd56339..ea0247e 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -528,7 +528,10 @@ char **merge_list(char **include_list, char **exclude_list) int new_include_count = 0; int include_count = 0; int exclude_count; - + + if (include_list == NULL) + return exclude_list; + while (include_list[include_count] != NULL) { int found = FALSE; exclude_count = 0; @@ -684,8 +687,8 @@ int tar_main(int argc, char **argv) #ifdef BB_FEATURE_TAR_EXCLUDE /* Remove excluded files from the include list */ if (exclude_list != NULL) { - /* If both an exclude and include file list was present then - * its an exclude from include list only, if not its really an + /* If both an exclude and include file list were present then + * it's an exclude from include list only, if not it's really an * exclude list (and a poor choice of variable names) */ if (include_list == NULL) { extract_function |= extract_exclude_list; @@ -528,7 +528,10 @@ char **merge_list(char **include_list, char **exclude_list) int new_include_count = 0; int include_count = 0; int exclude_count; - + + if (include_list == NULL) + return exclude_list; + while (include_list[include_count] != NULL) { int found = FALSE; exclude_count = 0; @@ -684,8 +687,8 @@ int tar_main(int argc, char **argv) #ifdef BB_FEATURE_TAR_EXCLUDE /* Remove excluded files from the include list */ if (exclude_list != NULL) { - /* If both an exclude and include file list was present then - * its an exclude from include list only, if not its really an + /* If both an exclude and include file list were present then + * it's an exclude from include list only, if not it's really an * exclude list (and a poor choice of variable names) */ if (include_list == NULL) { extract_function |= extract_exclude_list; |