Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive/decompress_unxz.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_unxz.c (modified) (7 diffs)

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

@@ -11 +11 @@
  */
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 #define XZ_FUNC FAST_FUNC
@@ -31 +31 @@
 #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
 #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
-#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
-#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
 
 #include "unxz/xz_dec_bcj.c"
@@ -39 +39 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_xz_stream(int src_fd, int dst_fd)
+unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
 {
+    enum xz_ret xz_result;
     struct xz_buf iobuf;
     struct xz_dec *state;
@@ -50 +51 @@
 
     memset(&iobuf, 0, sizeof(iobuf));
-    /* Preload XZ file signature */
-    membuf = (void*) strcpy(xmalloc(2 * BUFSIZ), HEADER_MAGIC);
+    membuf = xmalloc(2 * BUFSIZ);
     iobuf.in = membuf;
-    iobuf.in_size = HEADER_MAGIC_SIZE;
     iobuf.out = membuf + BUFSIZ;
     iobuf.out_size = BUFSIZ;
+
+    if (!aux || aux->check_signature == 0) {
+        /* Preload XZ file signature */
+        strcpy((char*)membuf, HEADER_MAGIC);
+        iobuf.in_size = HEADER_MAGIC_SIZE;
+    } /* else: let xz code read & check it */
 
     /* Limit memory usage to about 64 MiB. */
     state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
 
+    xz_result = X_OK;
     while (1) {
-        enum xz_ret r;
-
         if (iobuf.in_pos == iobuf.in_size) {
             int rd = safe_read(src_fd, membuf, BUFSIZ);
@@ -70 +74 @@
                 break;
             }
+            if (rd == 0 && xz_result == XZ_STREAM_END)
+                break;
             iobuf.in_size = rd;
             iobuf.in_pos = 0;
         }
+        if (xz_result == XZ_STREAM_END) {
+            /*
+             * Try to start decoding next concatenated stream.
+             * Stream padding must always be a multiple of four
+             * bytes to preserve four-byte alignment. To keep the
+             * code slightly smaller, we aren't as strict here as
+             * the .xz spec requires. We just skip all zero-bytes
+             * without checking the alignment and thus can accept
+             * files that aren't valid, e.g. the XZ utils test
+             * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
+             */
+            do {
+                if (membuf[iobuf.in_pos] != 0) {
+                    xz_dec_reset(state);
+                    goto do_run;
+                }
+                iobuf.in_pos++;
+            } while (iobuf.in_pos < iobuf.in_size);
+        }
+ do_run:
 //      bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
 //              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
-        r = xz_dec_run(state, &iobuf);
+        xz_result = xz_dec_run(state, &iobuf);
 //      bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
-//              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
+//              iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
         if (iobuf.out_pos) {
             xwrite(dst_fd, iobuf.out, iobuf.out_pos);
@@ -83 +109 @@
             iobuf.out_pos = 0;
         }
-        if (r == XZ_STREAM_END) {
-            break;
+        if (xz_result == XZ_STREAM_END) {
+            /*
+             * Can just "break;" here, if not for concatenated
+             * .xz streams.
+             * Checking for padding may require buffer
+             * replenishment. Can't do it here.
+             */
+            continue;
         }
-        if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
+        if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
             bb_error_msg("corrupted data");
             total = -1;
@@ -92 +124 @@
         }
     }
+
     xz_dec_end(state);
     free(membuf);