aboutsummaryrefslogtreecommitdiff
path: root/archival/libarchive
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-10-31 01:05:16 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2011-10-31 01:05:16 +0100
commitc531b9a3e4a90fd7c91c78a6991e30bfe0134f34 (patch)
tree63883e7ad41456977664c0a4f2d3b36d980bebd7 /archival/libarchive
parentb076193f741740886a6771cfe7750adb58ce18a0 (diff)
downloadbusybox-c531b9a3e4a90fd7c91c78a6991e30bfe0134f34.tar.gz
bzcat: fix unpacking of more than one file, and unpacking of zero-size bz2. Closes 4393
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libarchive')
-rw-r--r--archival/libarchive/decompress_bunzip2.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index cd3144743..c4640d489 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -752,7 +752,14 @@ unpack_bz2_stream(int src_fd, int dst_fd)
}
}
- if (i != RETVAL_LAST_BLOCK) {
+ if (i != RETVAL_LAST_BLOCK
+ /* Observed case when i == RETVAL_OK:
+ * "bzcat z.bz2", where "z.bz2" is a bzipped zero-length file
+ * (to be exact, z.bz2 is exactly these 14 bytes:
+ * 42 5a 68 39 17 72 45 38 50 90 00 00 00 00).
+ */
+ && i != RETVAL_OK
+ ) {
bb_error_msg("bunzip error %d", i);
break;
}