diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-01-08 08:57:29 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-01-08 08:57:29 +0000 |
| commit | 373ca863f65de0c572faf80fab5586755d073fc8 (patch) | |
| tree | 1858e79664e0a1b1b1d18ed720e8967713a6c5ba | |
| parent | 3ef86d069577b8a44ebe3aa890c6e97ea31d0d56 (diff) | |
| download | busybox-w32-373ca863f65de0c572faf80fab5586755d073fc8.tar.gz busybox-w32-373ca863f65de0c572faf80fab5586755d073fc8.tar.bz2 busybox-w32-373ca863f65de0c572faf80fab5586755d073fc8.zip | |
unzip: use data from local header rather than CDF
The zip file referenced in this bug report:
https://bugs.busybox.net/show_bug.cgi?id=9536
isn't extracted correctly with the upstream fix.
| -rw-r--r-- | archival/unzip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archival/unzip.c b/archival/unzip.c index 7029f66c3..9ad03d0e2 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
| @@ -627,7 +627,7 @@ int unzip_main(int argc, char **argv) | |||
| 627 | cdf_offset = read_next_cdf(cdf_offset, &cdf_header); | 627 | cdf_offset = read_next_cdf(cdf_offset, &cdf_header); |
| 628 | if (cdf_offset == 0) /* EOF? */ | 628 | if (cdf_offset == 0) /* EOF? */ |
| 629 | break; | 629 | break; |
| 630 | # if 0 | 630 | # if 1 |
| 631 | xlseek(zip_fd, | 631 | xlseek(zip_fd, |
| 632 | SWAP_LE32(cdf_header.formatted.relative_offset_of_local_header) + 4, | 632 | SWAP_LE32(cdf_header.formatted.relative_offset_of_local_header) + 4, |
| 633 | SEEK_SET); | 633 | SEEK_SET); |