Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive/decompress_bunzip2.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/libarchive/decompress_bunzip2.c (modified) (6 diffs)

branches/3.2/mindi-busybox/archival/libarchive/decompress_bunzip2.c

@@ -41 +41 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 /* Constants for Huffman coding */
@@ -722 +722 @@
 /* Decompress src_fd to dst_fd.  Stops at end of bzip data, not end of file. */
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_bz2_stream(int src_fd, int dst_fd)
+unpack_bz2_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
 {
     IF_DESKTOP(long long total_written = 0;)
@@ -729 +729 @@
     int i;
     unsigned len;
+
+    if (check_signature16(aux, src_fd, BZIP2_MAGIC))
+        return -1;
 
     outbuf = xmalloc(IOBUF_SIZE);
@@ -753 +756 @@
         }
 
-        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;
@@ -788 +798 @@
 }
 
-IF_DESKTOP(long long) int FAST_FUNC
-unpack_bz2_stream_prime(int src_fd, int dst_fd)
-{
-    uint16_t magic2;
-    xread(src_fd, &magic2, 2);
-    if (magic2 != BZIP2_MAGIC) {
-        bb_error_msg_and_die("invalid magic");
-    }
-    return unpack_bz2_stream(src_fd, dst_fd);
-}
-
 #ifdef TESTING
 
@@ -813 +812 @@
     char c;
 
-    int i = unpack_bz2_stream_prime(0, 1);
+    int i = unpack_bz2_stream(0, 1);
     if (i < 0)
         fprintf(stderr, "%s\n", bunzip_errors[-i]);