c6f213ade
Eugene Rudoy
2017-11-09
Subject
unzip: fix content listing and filtering when -j is used
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/unzip.c+8 -7
| @@ -805,13 +805,6 @@ int unzip_main(int argc, char **argv) | |
| /* Guard against "/abspath", "/../" and similar attacks */ | |
| overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn)); | |
| - | if (opts & OPT_j) /* Strip paths? */ |
| - | overlapping_strcpy(dst_fn, bb_basename(dst_fn)); |
| - | |
| - | /* Did this strip everything ("DIR/" case)? Then skip */ |
| - | if (!dst_fn[0]) |
| - | goto skip_cmpsize; |
| - | |
| /* Filter zip entries */ | |
| if (find_list_entry(zreject, dst_fn) | |
| || (zaccept && !find_list_entry(zaccept, dst_fn)) | |
| @@ -876,6 +869,14 @@ int unzip_main(int argc, char **argv) | |
| /* Extracting to STDOUT */ | |
| goto do_extract; | |
| } | |
| + | |
| + | /* Strip paths (after -l: unzip -lj a.zip lists full names) */ |
| + | if (opts & OPT_j) |
| + | overlapping_strcpy(dst_fn, bb_basename(dst_fn)); |
| + | /* Did this strip everything ("DIR/" case)? Then skip */ |
| + | if (!dst_fn[0]) |
| + | goto skip_cmpsize; |
| + | |
| if (last_char_is(dst_fn, '/')) { | |
| int mode; | |