6 files changed, 60 insertions, 15 deletions

diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index e1a8a7529..d2f284b08 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -91,6 +91,7 @@ lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.
 lib-$(CONFIG_FEATURE_SEAMLESS_XZ)       += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += open_transformer.o decompress_bunzip2.o
 lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += open_transformer.o decompress_bunzip2.o
+lib-$(CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS) += open_transformer.o decompress_bunzip2.o
 
 ifneq ($(lib-y),)
 lib-y += $(COMMON_FILES)
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 7ef4e035f..78366f26a 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -107,7 +107,7 @@ struct bunzip_data {
         uint8_t selectors[32768];  /* nSelectors=15 bits */
         struct group_data groups[MAX_GROUPS];  /* Huffman coding tables */
 };
-/* typedef struct bunzip_data bunzip_data; -- done in .h file */
+typedef struct bunzip_data bunzip_data;
 
 
 /* Return the next nnn bits of input.  All reads from the compressed input
@@ -575,7 +575,7 @@ static int get_next_block(bunzip_data *bd)
    in outbuf. IOW: on EOF returns len ("all bytes are not filled"), not 0.
    (Why? This allows to get rid of one local variable)
 */
-int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len)
+static int read_bunzip(bunzip_data *bd, char *outbuf, int len)
 {
         const uint32_t *dbuf;
         int pos, current, previous;
@@ -699,7 +699,7 @@ int FAST_FUNC read_bunzip(bunzip_data *bd, char *outbuf, int len)
 /* Because bunzip2 is used for help text unpacking, and because bb_show_usage()
    should work for NOFORK applets too, we must be extremely careful to not leak
    any allocations! */
-int FAST_FUNC start_bunzip(
+static int FAST_FUNC start_bunzip(
                 void *jmpbuf,
                 bunzip_data **bdp,
                 int in_fd,
@@ -759,7 +759,7 @@ int FAST_FUNC start_bunzip(
         return RETVAL_OK;
 }
 
-void FAST_FUNC dealloc_bunzip(bunzip_data *bd)
+static void FAST_FUNC dealloc_bunzip(bunzip_data *bd)
 {
         free(bd->dbuf);
         free(bd);
@@ -809,7 +809,7 @@ unpack_bz2_stream(transformer_state_t *xstate)
                 /* 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).
+                 * 42 5a 68 39 17 72 45 38 50 90 00 00 00 00).
                  */
                  && i != RETVAL_OK
                 ) {
@@ -847,6 +847,36 @@ unpack_bz2_stream(transformer_state_t *xstate)
         return i ? i : IF_DESKTOP(total_written) + 0;
 }
 
+char* FAST_FUNC
+unpack_bz2_data(const char *packed, int packed_len, int unpacked_len)
+{
+        char *outbuf = NULL;
+        bunzip_data *bd;
+        int i;
+        jmp_buf jmpbuf;
+
+        /* Setup for I/O error handling via longjmp */
+        i = setjmp(jmpbuf);
+        if (i == 0) {
+                i = start_bunzip(&jmpbuf,
+                        &bd,
+                        /* src_fd: */ -1,
+                        /* inbuf:  */ packed,
+                        /* len:    */ packed_len
+                );
+        }
+        /* read_bunzip can longjmp and end up here with i != 0
+         * on read data errors! Not trivial */
+        if (i == 0) {
+                /* Cannot use xmalloc: will leak bd in NOFORK case! */
+                outbuf = malloc_or_warn(unpacked_len);
+                if (outbuf)
+                        read_bunzip(bd, outbuf, unpacked_len);
+        }
+        dealloc_bunzip(bd);
+        return outbuf;
+}
+
 #ifdef TESTING
 
 static char *const bunzip_errors[] = {
diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 6886239d0..668b01618 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -353,8 +353,10 @@ unpack_lzma_stream(transformer_state_t *xstate)
                                                 if ((int32_t)pos < 0) {
                                                         pos += header.dict_size;
                                                         /* see unzip_bad_lzma_2.zip: */
-                                                        if (pos >= buffer_size)
+                                                        if (pos >= buffer_size) {
+                                                                dbg("%d pos:%d buffer_size:%d", __LINE__, pos, buffer_size);
                                                                 goto bad;
+                                                        }
                                                 }
                                                 previous_byte = buffer[pos];
                                                 goto one_byte1;
@@ -430,10 +432,9 @@ unpack_lzma_stream(transformer_state_t *xstate)
                                                 for (; num_bits2 != LZMA_NUM_ALIGN_BITS; num_bits2--)
                                                         rep0 = (rep0 << 1) | rc_direct_bit(rc);
                                                 rep0 <<= LZMA_NUM_ALIGN_BITS;
-                                                if ((int32_t)rep0 < 0) {
-                                                        dbg("%d rep0:%d", __LINE__, rep0);
-                                                        goto bad;
-                                                }
+                                                // Note: (int32_t)rep0 may be < 0 here
+                                                // (I have linux-3.3.4.tar.lzma which has it).
+                                                // I moved the check after "++rep0 == 0" check below.
                                                 prob3 = p + LZMA_ALIGN;
                                         }
                                         i2 = 1;
@@ -444,8 +445,13 @@ unpack_lzma_stream(transformer_state_t *xstate)
                                                 i2 <<= 1;
                                         }
                                 }
-                                if (++rep0 == 0)
-                                        break;
+                                rep0++;
+                                if ((int32_t)rep0 <= 0) {
+                                        if (rep0 == 0)
+                                                break;
+                                        dbg("%d rep0:%d", __LINE__, rep0);
+                                        goto bad;
+                                }
                         }
 
                         len += LZMA_MATCH_MIN_LEN;
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index 5c495e14e..52fa4554a 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -414,7 +414,8 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
 //      case 'D':       /* GNU dump dir */
 //      case 'M':       /* Continuation of multi volume archive */
 //      case 'N':       /* Old GNU for names > 100 characters */
-//      case 'V':       /* Volume header */
+        case 'V':       /* Volume header */
+                ; /* Fall through to skip it */
 #endif
         }
  skip_ext_hdr:
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 0160a64fe..399ee03a7 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -304,8 +304,7 @@ static transformer_state_t *open_transformer(const char *fname, int fail_if_not_
 
         if (ENABLE_FEATURE_SEAMLESS_LZMA) {
                 /* .lzma has no header/signature, can only detect it by extension */
-                char *sfx = strrchr(fname, '.');
-                if (sfx && strcmp(sfx+1, "lzma") == 0) {
+                if (is_suffixed_with(fname, ".lzma")) {
                         xstate = xzalloc(sizeof(*xstate));
                         xstate->src_fd = fd;
                         xstate->xformer = unpack_lzma_stream;
diff --git a/archival/tar.c b/archival/tar.c
index 9a171ceea..22ad0e0f2 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1197,8 +1197,16 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                         tar_handle->seek = seek_by_read;
                 } else
                 if (ENABLE_FEATURE_TAR_AUTODETECT
+                 && ENABLE_FEATURE_SEAMLESS_LZMA
                  && flags == O_RDONLY
                  && !(opt & OPT_ANY_COMPRESS)
+                 && is_suffixed_with(tar_filename, ".lzma")
+                /* We do this only for .lzma files, they have no signature.
+                 * All other compression formats are recognized in
+                 * get_header_tar() when first tar block has invalid format.
+                 * Doing it here for all filenames would falsely trigger
+                 * on e.g. tarball with 1st file named "BZh5".
+                 */
                 ) {
                         tar_handle->src_fd = open_zipped(tar_filename, /*fail_if_not_compressed:*/ 0);
                         if (tar_handle->src_fd < 0)