Merge branch 'busybox' into merge

3 files changed, 22 insertions, 13 deletions

diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index ca32bd82c..3d99e1388 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -214,8 +214,6 @@ unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst
         uint32_t pos_state_mask;
         uint32_t literal_pos_mask;
         uint16_t *p;
-        int num_bits;
-        int num_probs;
         rc_t *rc;
         int i;
         uint8_t *buffer;
@@ -239,6 +237,9 @@ unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst
         pos_state_mask = (1 << pb) - 1;
         literal_pos_mask = (1 << lp) - 1;
 
+        /* Example values from linux-3.3.4.tar.lzma:
+         * dict_size: 64M, dst_size: 2^64-1
+         */
         header.dict_size = SWAP_LE32(header.dict_size);
         header.dst_size = SWAP_LE64(header.dst_size);
 
@@ -247,11 +248,15 @@ unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst
 
         buffer = xmalloc(MIN(header.dst_size, header.dict_size));
 
-        num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
-        p = xmalloc(num_probs * sizeof(*p));
-        num_probs += LZMA_LITERAL - LZMA_BASE_SIZE;
-        for (i = 0; i < num_probs; i++)
-                p[i] = (1 << RC_MODEL_TOTAL_BITS) >> 1;
+        {
+                int num_probs;
+
+                num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
+                p = xmalloc(num_probs * sizeof(*p));
+                num_probs += LZMA_LITERAL - LZMA_BASE_SIZE;
+                for (i = 0; i < num_probs; i++)
+                        p[i] = (1 << RC_MODEL_TOTAL_BITS) >> 1;
+        }
 
         rc = rc_init(src_fd); /*, RC_BUFFER_SIZE); */
 
@@ -310,6 +315,7 @@ unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst
                         goto one_byte2;
 #endif
                 } else {
+                        int num_bits;
                         int offset;
                         uint16_t *prob2;
 #define prob_len prob2
@@ -440,6 +446,9 @@ unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst
                                 }
                                 len--;
                         } while (len != 0 && buffer_pos < header.dst_size);
+                        /* FIXME: ...........^^^^^
+                         * shouldn't it be "global_pos + buffer_pos < header.dst_size"?
+                         */
                 }
         }
 
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 54d910431..ba43bb073 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -243,7 +243,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
                  * or not first block (false positive, it's not .gz/.bz2!) */
                 if (lseek(archive_handle->src_fd, -i, SEEK_CUR) != 0)
                         goto err;
-                if (setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_detected:*/ 0) != 0)
+                if (setup_unzip_on_fd(archive_handle->src_fd, /*fail_if_not_compressed:*/ 0) != 0)
  err:
                         bb_error_msg_and_die("invalid tar magic");
                 archive_handle->offset = 0;
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index b11bf46af..e49eab409 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -120,7 +120,7 @@ void FAST_FUNC open_transformer(int fd, const char *transform_prog)
 /* Used by e.g. rpm which gives us a fd without filename,
  * thus we can't guess the format from filename's extension.
  */
-int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_detected)
+int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_compressed)
 {
         union {
                 uint8_t b[4];
@@ -161,7 +161,7 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_detected)
         }
 
         /* No known magic seen */
-        if (fail_if_not_detected)
+        if (fail_if_not_compressed)
                 bb_error_msg_and_die("no gzip"
                         IF_FEATURE_SEAMLESS_BZ2("/bzip2")
                         IF_FEATURE_SEAMLESS_XZ("/xz")
@@ -182,7 +182,7 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_detected)
         return 0;
 }
 
-int FAST_FUNC open_zipped(const char *fname)
+int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed)
 {
         int fd;
 
@@ -202,7 +202,7 @@ int FAST_FUNC open_zipped(const char *fname)
          || (ENABLE_FEATURE_SEAMLESS_BZ2)
          || (ENABLE_FEATURE_SEAMLESS_XZ)
         ) {
-                setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
+                setup_unzip_on_fd(fd, fail_if_not_compressed);
         }
 
         return fd;
@@ -215,7 +215,7 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
         int fd;
         char *image;
 
-        fd = open_zipped(fname);
+        fd = open_zipped(fname, /*fail_if_not_compressed:*/ 0);
         if (fd < 0)
                 return NULL;