Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/archival/libarchive/Kbuild.src (modified) (4 diffs)
• mindi-busybox/archival/libarchive/bz/compress.c (modified) (5 diffs)
• mindi-busybox/archival/libarchive/common.c (added)
• mindi-busybox/archival/libarchive/data_extract_all.c (modified) (14 diffs)
• mindi-busybox/archival/libarchive/data_extract_to_command.c (modified) (2 diffs)
• mindi-busybox/archival/libarchive/decompress_bunzip2.c (modified) (9 diffs)
• mindi-busybox/archival/libarchive/decompress_gunzip.c (modified) (23 diffs)
• mindi-busybox/archival/libarchive/decompress_uncompress.c (modified) (6 diffs)
• mindi-busybox/archival/libarchive/decompress_unlzma.c (modified) (16 diffs)
• mindi-busybox/archival/libarchive/decompress_unxz.c (modified) (4 diffs)
• mindi-busybox/archival/libarchive/decompress_unzip.c (deleted)
• mindi-busybox/archival/libarchive/filter_accept_list_reassign.c (modified) (2 diffs)
• mindi-busybox/archival/libarchive/get_header_ar.c (modified) (4 diffs)
• mindi-busybox/archival/libarchive/get_header_cpio.c (modified) (3 diffs)
• mindi-busybox/archival/libarchive/get_header_tar.c (modified) (14 diffs)
• mindi-busybox/archival/libarchive/get_header_tar_bz2.c (modified) (1 diff)
• mindi-busybox/archival/libarchive/get_header_tar_gz.c (modified) (1 diff)
• mindi-busybox/archival/libarchive/get_header_tar_lzma.c (modified) (1 diff)
• mindi-busybox/archival/libarchive/get_header_tar_xz.c (added)
• mindi-busybox/archival/libarchive/liblzo.h (modified) (2 diffs)
• mindi-busybox/archival/libarchive/lzo1x_9x.c (modified) (3 diffs)
• mindi-busybox/archival/libarchive/lzo1x_d.c (modified) (3 diffs)
• mindi-busybox/archival/libarchive/open_transformer.c (modified) (13 diffs)
• mindi-busybox/archival/libarchive/unpack_ar_archive.c (modified) (1 diff)
• mindi-busybox/archival/libarchive/unsafe_prefix.c (added)
• mindi-busybox/archival/libarchive/unxz/README (modified) (3 diffs)
• mindi-busybox/archival/libarchive/unxz/xz.h (modified) (5 diffs)
• mindi-busybox/archival/libarchive/unxz/xz_dec_bcj.c (modified) (3 diffs)
• mindi-busybox/archival/libarchive/unxz/xz_dec_lzma2.c (modified) (5 diffs)
• mindi-busybox/archival/libarchive/unxz/xz_dec_stream.c (modified) (2 diffs)
• mindi-busybox/archival/libarchive/unxz/xz_stream.h (modified) (2 diffs)

branches/3.3/mindi-busybox/archival/libarchive/Kbuild.src

@@ -5 +5 @@
 # Licensed under GPLv2 or later, see file LICENSE in this source tree.
 
-lib-y:=
+lib-y:= common.o
 
 COMMON_FILES:= \
@@ -31 +31 @@
     unpack_ar_archive.o \
     filter_accept_list_reassign.o \
+    unsafe_prefix.o \
     get_header_ar.o \
     get_header_tar.o \
@@ -36 +37 @@
     get_header_tar_bz2.o \
     get_header_tar_lzma.o \
+    get_header_tar_xz.o \
 
 INSERT
 
-lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
-lib-$(CONFIG_BUNZIP2)                   += decompress_bunzip2.o
-lib-$(CONFIG_UNLZMA)                    += decompress_unlzma.o
-lib-$(CONFIG_UNXZ)                      += decompress_unxz.o
-lib-$(CONFIG_CPIO)                      += get_header_cpio.o
 lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
 lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
-lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
-lib-$(CONFIG_RPM2CPIO)                  += decompress_gunzip.o get_header_cpio.o
-lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
-lib-$(CONFIG_TAR)                       += get_header_tar.o
-lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
-lib-$(CONFIG_UNZIP)                     += decompress_gunzip.o
+
+lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
+lib-$(CONFIG_CPIO)                      += get_header_cpio.o
+lib-$(CONFIG_TAR)                       += get_header_tar.o unsafe_prefix.o
+lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
 lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
+lib-$(CONFIG_BUNZIP2)                   += open_transformer.o decompress_bunzip2.o
+lib-$(CONFIG_UNLZMA)                    += open_transformer.o decompress_unlzma.o
+lib-$(CONFIG_UNXZ)                      += open_transformer.o decompress_unxz.o
+lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_UNCOMPRESS)                += open_transformer.o decompress_uncompress.o
+lib-$(CONFIG_UNZIP)                     += open_transformer.o decompress_gunzip.o unsafe_prefix.o
+lib-$(CONFIG_RPM2CPIO)                  += open_transformer.o decompress_gunzip.o get_header_cpio.o
+lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
+
+lib-$(CONFIG_GZIP)                      += open_transformer.o
+lib-$(CONFIG_BZIP2)                     += open_transformer.o
+lib-$(CONFIG_LZOP)                      += open_transformer.o
+lib-$(CONFIG_MAN)                       += open_transformer.o
+lib-$(CONFIG_SETFONT)                   += open_transformer.o
+lib-$(CONFIG_FEATURE_2_4_MODULES)       += open_transformer.o
 lib-$(CONFIG_MODINFO)                   += open_transformer.o
 lib-$(CONFIG_INSMOD)                    += open_transformer.o
+lib-$(CONFIG_DEPMOD)                    += open_transformer.o
+lib-$(CONFIG_RMMOD)                     += open_transformer.o
+lib-$(CONFIG_LSMOD)                     += open_transformer.o
+lib-$(CONFIG_MODPROBE)                  += open_transformer.o
+lib-$(CONFIG_MODPROBE_SMALL)            += open_transformer.o
+
 lib-$(CONFIG_FEATURE_SEAMLESS_Z)        += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_gunzip.o
@@ -62 +79 @@
 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) += decompress_bunzip2.o
-lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
+lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += open_transformer.o decompress_bunzip2.o
 
 ifneq ($(lib-y),)

branches/3.3/mindi-busybox/archival/libarchive/bz/compress.c

@@ -250 +250 @@
 void sendMTFValues(EState* s)
 {
-    int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
+    int32_t v, t, i, j, gs, ge, bt, bc, iter;
     int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
     int32_t nGroups;
@@ -346 +346 @@
 #endif
         nSelectors = 0;
-        totc = 0;
         gs = 0;
         while (1) {
@@ -387 +386 @@
                 cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
                 cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
-
             } else
 #endif
@@ -412 +410 @@
                 }
             }
-            totc += bc;
             fave[bt]++;
             s->selector[nSelectors] = bt;
@@ -502 +499 @@
             if (sizeof(long) <= 4) {
                 inUse16 = inUse16*2 +
-                    ((*(uint32_t*)&(s->inUse[i * 16 + 0])
-                    | *(uint32_t*)&(s->inUse[i * 16 + 4])
-                    | *(uint32_t*)&(s->inUse[i * 16 + 8])
-                    | *(uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
+                    ((*(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 0])
+                    | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 4])
+                    | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 8])
+                    | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
             } else { /* Our CPU can do better */
                 inUse16 = inUse16*2 +
-                    ((*(uint64_t*)&(s->inUse[i * 16 + 0])
-                    | *(uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
+                    ((*(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 0])
+                    | *(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
             }
         }

branches/3.3/mindi-busybox/archival/libarchive/data_extract_all.c

@@ -12 +12 @@
     int dst_fd;
     int res;
+    char *hard_link;
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+    char *dst_name;
+#else
+# define dst_name (file_header->name)
+#endif
 
 #if ENABLE_FEATURE_TAR_SELINUX
@@ -24 +30 @@
 #endif
 
+    /* Hard links are encoded as regular files of size 0
+     * with a nonempty link field */
+    hard_link = NULL;
+    if (S_ISREG(file_header->mode) && file_header->size == 0)
+        hard_link = file_header->link_target;
+
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+    dst_name = file_header->name;
+    if (archive_handle->tar__strip_components) {
+        unsigned n = archive_handle->tar__strip_components;
+        do {
+            dst_name = strchr(dst_name, '/');
+            if (!dst_name || dst_name[1] == '\0') {
+                data_skip(archive_handle);
+                goto ret;
+            }
+            dst_name++;
+            /*
+             * Link target is shortened only for hardlinks:
+             * softlinks restored unchanged.
+             */
+            if (hard_link) {
+// GNU tar 1.26 does not check that we reached end of link name:
+// if "dir/hardlink" is hardlinked to "file",
+// tar xvf a.tar --strip-components=1 says:
+//  tar: hardlink: Cannot hard link to '': No such file or directory
+// and continues processing. We silently skip such entries.
+                hard_link = strchr(hard_link, '/');
+                if (!hard_link || hard_link[1] == '\0') {
+                    data_skip(archive_handle);
+                    goto ret;
+                }
+                hard_link++;
+            }
+        } while (--n != 0);
+    }
+#endif
+
     if (archive_handle->ah_flags & ARCHIVE_CREATE_LEADING_DIRS) {
-        char *slash = strrchr(file_header->name, '/');
+        char *slash = strrchr(dst_name, '/');
         if (slash) {
             *slash = '\0';
-            bb_make_directory(file_header->name, -1, FILEUTILS_RECUR);
+            bb_make_directory(dst_name, -1, FILEUTILS_RECUR);
             *slash = '/';
         }
@@ -36 +80 @@
         /* Remove the entry if it exists */
         if (!S_ISDIR(file_header->mode)) {
-            /* Is it hardlink?
-             * We encode hard links as regular files of size 0 with a symlink */
-            if (S_ISREG(file_header->mode)
-             && file_header->link_target
-             && file_header->size == 0
-            ) {
+            if (hard_link) {
                 /* Ugly special case:
                  * tar cf t.tar hardlink1 hardlink2 hardlink1
@@ -49 +88 @@
                  * hardlink1 -> hardlink1 <== !!!
                  */
-                if (strcmp(file_header->link_target, file_header->name) == 0)
+                if (strcmp(hard_link, dst_name) == 0)
                     goto ret;
             }
             /* Proceed with deleting */
-            if (unlink(file_header->name) == -1
+            if (unlink(dst_name) == -1
              && errno != ENOENT
             ) {
                 bb_perror_msg_and_die("can't remove old file %s",
-                        file_header->name);
+                        dst_name);
             }
         }
@@ -64 +103 @@
         /* Remove the existing entry if its older than the extracted entry */
         struct stat existing_sb;
-        if (lstat(file_header->name, &existing_sb) == -1) {
+        if (lstat(dst_name, &existing_sb) == -1) {
             if (errno != ENOENT) {
                 bb_perror_msg_and_die("can't stat old file");
@@ -74 +113 @@
             ) {
                 bb_error_msg("%s not created: newer or "
-                    "same age file exists", file_header->name);
+                    "same age file exists", dst_name);
             }
             data_skip(archive_handle);
             goto ret;
         }
-        else if ((unlink(file_header->name) == -1) && (errno != EISDIR)) {
+        else if ((unlink(dst_name) == -1) && (errno != EISDIR)) {
             bb_perror_msg_and_die("can't remove old file %s",
-                    file_header->name);
-        }
-    }
-
-    /* Handle hard links separately
-     * We encode hard links as regular files of size 0 with a symlink */
-    if (S_ISREG(file_header->mode)
-     && file_header->link_target
-     && file_header->size == 0
-    ) {
-        /* hard link */
-        res = link(file_header->link_target, file_header->name);
-        if ((res == -1) && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
+                    dst_name);
+        }
+    }
+
+    /* Handle hard links separately */
+    if (hard_link) {
+        res = link(hard_link, dst_name);
+        if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
             bb_perror_msg("can't create %slink "
                     "from %s to %s", "hard",
-                    file_header->name,
-                    file_header->link_target);
+                    dst_name,
+                    hard_link);
         }
         /* Hardlinks have no separate mode/ownership, skip chown/chmod */
@@ -107 +141 @@
     case S_IFREG: {
         /* Regular file */
+        char *dst_nameN;
         int flags = O_WRONLY | O_CREAT | O_EXCL;
         if (archive_handle->ah_flags & ARCHIVE_O_TRUNC)
             flags = O_WRONLY | O_CREAT | O_TRUNC;
-        dst_fd = xopen3(file_header->name,
+        dst_nameN = dst_name;
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+        if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME)
+            /* rpm-style temp file name */
+            dst_nameN = xasprintf("%s;%x", dst_name, (int)getpid());
+#endif
+        dst_fd = xopen3(dst_nameN,
             flags,
             file_header->mode
@@ -116 +157 @@
         bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size);
         close(dst_fd);
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+        if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) {
+            xrename(dst_nameN, dst_name);
+            free(dst_nameN);
+        }
+#endif
         break;
     }
     case S_IFDIR:
-        res = mkdir(file_header->name, file_header->mode);
+        res = mkdir(dst_name, file_header->mode);
         if ((res == -1)
          && (errno != EISDIR) /* btw, Linux doesn't return this */
@@ -125 +172 @@
          && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
         ) {
-            bb_perror_msg("can't make dir %s", file_header->name);
+            bb_perror_msg("can't make dir %s", dst_name);
         }
         break;
@@ -131 +178 @@
         /* Symlink */
 //TODO: what if file_header->link_target == NULL (say, corrupted tarball?)
-        res = symlink(file_header->link_target, file_header->name);
-        if ((res == -1)
+        res = symlink(file_header->link_target, dst_name);
+        if (res != 0
          && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
         ) {
             bb_perror_msg("can't create %slink "
                 "from %s to %s", "sym",
-                file_header->name,
+                dst_name,
                 file_header->link_target);
         }
@@ -145 +192 @@
     case S_IFCHR:
     case S_IFIFO:
-        res = mknod(file_header->name, file_header->mode, file_header->device);
+        res = mknod(dst_name, file_header->mode, file_header->device);
         if ((res == -1)
          && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
         ) {
-            bb_perror_msg("can't create node %s", file_header->name);
+            bb_perror_msg("can't create node %s", dst_name);
         }
         break;
@@ -174 +221 @@
 #endif
             /* GNU tar 1.15.1 uses chown, not lchown */
-            chown(file_header->name, uid, gid);
+            chown(dst_name, uid, gid);
         }
         /* uclibc has no lchmod, glibc is even stranger -
@@ -180 +227 @@
          * so we use chmod... */
         if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_PERM)) {
-            chmod(file_header->name, file_header->mode);
+            chmod(dst_name, file_header->mode);
         }
         if (archive_handle->ah_flags & ARCHIVE_RESTORE_DATE) {
@@ -187 +234 @@
             t[1].tv_sec = t[0].tv_sec = file_header->mtime;
             t[1].tv_usec = t[0].tv_usec = 0;
-            utimes(file_header->name, t);
+            utimes(dst_name, t);
         }
     }

branches/3.3/mindi-busybox/archival/libarchive/data_extract_to_command.c

@@ -104 +104 @@
                 "-c",
                 archive_handle->tar__to_command,
-                NULL);
+                (char *)0);
             bb_perror_msg_and_die("can't execute '%s'", archive_handle->tar__to_command_shell);
         }
@@ -113 +113 @@
         close(p[1]);
 
-        if (safe_waitpid(pid, &status, 0) == -1)
-            bb_perror_msg_and_die("waitpid");
+        status = wait_for_exitstatus(pid);
         if (WIFEXITED(status) && WEXITSTATUS(status))
             bb_error_msg_and_die("'%s' returned status %d",
                 archive_handle->tar__to_command, WEXITSTATUS(status));
         if (WIFSIGNALED(status))
-            bb_error_msg_and_die("'%s' terminated on signal %d",
+            bb_error_msg_and_die("'%s' terminated by signal %d",
                 archive_handle->tar__to_command, WTERMSIG(status));
 

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

@@ -43 +43 @@
 #include "bb_archive.h"
 
+#if 0
+# define dbg(...) bb_error_msg(__VA_ARGS__)
+#else
+# define dbg(...) ((void)0)
+#endif
+
 /* Constants for Huffman coding */
 #define MAX_GROUPS          6
@@ -53 +59 @@
 /* Status return values */
 #define RETVAL_OK                       0
-#define RETVAL_LAST_BLOCK               (-1)
-#define RETVAL_NOT_BZIP_DATA            (-2)
-#define RETVAL_UNEXPECTED_INPUT_EOF     (-3)
-#define RETVAL_SHORT_WRITE              (-4)
-#define RETVAL_DATA_ERROR               (-5)
-#define RETVAL_OUT_OF_MEMORY            (-6)
-#define RETVAL_OBSOLETE_INPUT           (-7)
+#define RETVAL_LAST_BLOCK               (dbg("%d", __LINE__), -1)
+#define RETVAL_NOT_BZIP_DATA            (dbg("%d", __LINE__), -2)
+#define RETVAL_UNEXPECTED_INPUT_EOF     (dbg("%d", __LINE__), -3)
+#define RETVAL_SHORT_WRITE              (dbg("%d", __LINE__), -4)
+#define RETVAL_DATA_ERROR               (dbg("%d", __LINE__), -5)
+#define RETVAL_OUT_OF_MEMORY            (dbg("%d", __LINE__), -6)
+#define RETVAL_OBSOLETE_INPUT           (dbg("%d", __LINE__), -7)
 
 /* Other housekeeping constants */
@@ -441 +447 @@
         if (runPos != 0) {
             uint8_t tmp_byte;
-            if (dbufCount + runCnt >= dbufSize) return RETVAL_DATA_ERROR;
+            if (dbufCount + runCnt > dbufSize) {
+                dbg("dbufCount:%d+runCnt:%d %d > dbufSize:%d RETVAL_DATA_ERROR",
+                        dbufCount, runCnt, dbufCount + runCnt, dbufSize);
+                return RETVAL_DATA_ERROR;
+            }
             tmp_byte = symToByte[mtfSymbol[0]];
             byteCount[tmp_byte] += runCnt;
@@ -722 +732 @@
 /* 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(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+unpack_bz2_stream(transformer_state_t *xstate)
 {
     IF_DESKTOP(long long total_written = 0;)
@@ -730 +740 @@
     unsigned len;
 
-    if (check_signature16(aux, src_fd, BZIP2_MAGIC))
+    if (check_signature16(xstate, BZIP2_MAGIC))
         return -1;
 
@@ -737 +747 @@
     while (1) { /* "Process one BZ... stream" loop */
 
-        i = start_bunzip(&bd, src_fd, outbuf + 2, len);
+        i = start_bunzip(&bd, xstate->src_fd, outbuf + 2, len);
 
         if (i == 0) {
@@ -747 +757 @@
                 if (i == 0) /* EOF? */
                     break;
-                if (i != full_write(dst_fd, outbuf, i)) {
-                    bb_error_msg("short write");
+                if (i != transformer_write(xstate, outbuf, i)) {
                     i = RETVAL_SHORT_WRITE;
                     goto release_mem;
@@ -781 +790 @@
         memcpy(outbuf, &bd->inbuf[bd->inbufPos], len);
         if (len < 2) {
-            if (safe_read(src_fd, outbuf + len, 2 - len) != 2 - len)
+            if (safe_read(xstate->src_fd, outbuf + len, 2 - len) != 2 - len)
                 break;
             len = 2;
@@ -809 +818 @@
 int main(int argc, char **argv)
 {
-    int i;
     char c;
 

branches/3.3/mindi-busybox/archival/libarchive/decompress_gunzip.c

@@ -306 +306 @@
     unsigned j;             /* counter */
     int k;                  /* number of bits in current code */
-    unsigned *p;            /* pointer into c[], b[], or v[] */
+    const unsigned *p;      /* pointer into c[], b[], or v[] */
     huft_t *q;              /* points to current table */
     huft_t r;               /* table entry for structure assignment */
     huft_t *u[BMAX];        /* table stack */
-    unsigned v[N_MAX];      /* values in order of bit length */
+    unsigned v[N_MAX + 1];  /* values in order of bit length. last v[] is never used */
     int ws[BMAX + 1];       /* bits decoded stack */
     int w;                  /* bits decoded */
@@ -325 +325 @@
     /* Generate counts for each bit length */
     memset(c, 0, sizeof(c));
-    p = (unsigned *) b; /* cast allows us to reuse p for pointing to b */
+    p = b;
     i = n;
     do {
@@ -337 +337 @@
 
     /* Find minimum and maximum length, bound *m by those */
-    for (j = 1; (c[j] == 0) && (j <= BMAX); j++)
+    for (j = 1; (j <= BMAX) && (c[j] == 0); j++)
         continue;
     k = j; /* minimum code length */
@@ -365 +365 @@
     }
 
-    /* Make a table of values in order of bit lengths */
-    p = (unsigned *) b;
+    /* Make a table of values in order of bit lengths.
+     * To detect bad input, unused v[i]'s are set to invalid value UINT_MAX.
+     * In particular, last v[i] is never filled and must not be accessed.
+     */
+    memset(v, 0xff, sizeof(v));
+    p = b;
     i = 0;
     do {
@@ -433 +437 @@
             /* set up table entry in r */
             r.b = (unsigned char) (k - w);
-            if (p >= v + n) {
+            if (/*p >= v + n || -- redundant, caught by the second check: */
+                *p == UINT_MAX /* do we access uninited v[i]? (see memset(v))*/
+            ) {
                 r.e = 99; /* out of values--invalid code */
             } else if (*p < s) {
@@ -518 +524 @@
         if (e > 16)
             do {
-                if (e == 99)
-                    abort_unzip(PASS_STATE_ONLY);;
+                if (e == 99) {
+                    abort_unzip(PASS_STATE_ONLY);
+                }
                 bb >>= t->b;
                 k -= t->b;
@@ -555 +562 @@
             if (e > 16)
                 do {
-                    if (e == 99)
+                    if (e == 99) {
                         abort_unzip(PASS_STATE_ONLY);
+                    }
                     bb >>= t->b;
                     k -= t->b;
@@ -822 +830 @@
         b_dynamic >>= 4;
         k_dynamic -= 4;
-        if (nl > 286 || nd > 30)
+        if (nl > 286 || nd > 30) {
             abort_unzip(PASS_STATE_ONLY);   /* bad lengths */
+        }
 
         /* read in bit-length-code lengths */
@@ -904 +913 @@
 
         i = huft_build(ll, nl, 257, cplens, cplext, &inflate_codes_tl, &bl);
-        if (i != 0)
+        if (i != 0) {
             abort_unzip(PASS_STATE_ONLY);
+        }
         bd = dbits;
         i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &inflate_codes_td, &bd);
-        if (i != 0)
+        if (i != 0) {
             abort_unzip(PASS_STATE_ONLY);
+        }
 
         /* set up data for inflate_codes() */
@@ -972 +983 @@
 /* Called from unpack_gz_stream() and inflate_unzip() */
 static IF_DESKTOP(long long) int
-inflate_unzip_internal(STATE_PARAM int in, int out)
+inflate_unzip_internal(STATE_PARAM transformer_state_t *xstate)
 {
     IF_DESKTOP(long long) int n = 0;
@@ -981 +992 @@
     gunzip_outbuf_count = 0;
     gunzip_bytes_out = 0;
-    gunzip_src_fd = in;
+    gunzip_src_fd = xstate->src_fd;
 
     /* (re) initialize state */
@@ -997 +1008 @@
     if (setjmp(error_jmp)) {
         /* Error from deep inside zip machinery */
+        bb_error_msg(error_msg);
         n = -1;
         goto ret;
@@ -1003 +1015 @@
     while (1) {
         int r = inflate_get_next_window(PASS_STATE_ONLY);
-        nwrote = full_write(out, gunzip_window, gunzip_outbuf_count);
-        if (nwrote != (ssize_t)gunzip_outbuf_count) {
-            bb_perror_msg("write");
+        nwrote = transformer_write(xstate, gunzip_window, gunzip_outbuf_count);
+        if (nwrote == (ssize_t)-1) {
             n = -1;
             goto ret;
@@ -1035 +1046 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-inflate_unzip(transformer_aux_data_t *aux, int in, int out)
+inflate_unzip(transformer_state_t *xstate)
 {
     IF_DESKTOP(long long) int n;
@@ -1042 +1053 @@
     ALLOC_STATE;
 
-    to_read = aux->bytes_in;
+    to_read = xstate->bytes_in;
 //  bytebuffer_max = 0x8000;
     bytebuffer_offset = 4;
     bytebuffer = xmalloc(bytebuffer_max);
-    n = inflate_unzip_internal(PASS_STATE in, out);
+    n = inflate_unzip_internal(PASS_STATE xstate);
     free(bytebuffer);
 
-    aux->crc32 = gunzip_crc;
-    aux->bytes_out = gunzip_bytes_out;
+    xstate->crc32 = gunzip_crc;
+    xstate->bytes_out = gunzip_bytes_out;
     DEALLOC_STATE;
     return n;
@@ -1108 +1119 @@
 }
 
-static int check_header_gzip(STATE_PARAM transformer_aux_data_t *aux)
+static int check_header_gzip(STATE_PARAM transformer_state_t *xstate)
 {
     union {
@@ -1120 +1131 @@
         } PACKED formatted;
     } header;
-    struct BUG_header {
-        char BUG_header[sizeof(header) == 8 ? 1 : -1];
-    };
+
+    BUILD_BUG_ON(sizeof(header) != 8);
 
     /*
@@ -1170 +1180 @@
     }
 
-    if (aux)
-        aux->mtime = SWAP_LE32(header.formatted.mtime);
+    xstate->mtime = SWAP_LE32(header.formatted.mtime);
 
     /* Read the header checksum */
@@ -1183 +1192 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_gz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+unpack_gz_stream(transformer_state_t *xstate)
 {
     uint32_t v32;
@@ -1190 +1199 @@
 
 #if !ENABLE_FEATURE_SEAMLESS_Z
-    if (check_signature16(aux, src_fd, GZIP_MAGIC))
+    if (check_signature16(xstate, GZIP_MAGIC))
         return -1;
 #else
-    if (aux && aux->check_signature) {
+    if (!xstate->signature_skipped) {
         uint16_t magic2;
 
-        if (full_read(src_fd, &magic2, 2) != 2) {
+        if (full_read(xstate->src_fd, &magic2, 2) != 2) {
  bad_magic:
             bb_error_msg("invalid magic");
@@ -1202 +1211 @@
         }
         if (magic2 == COMPRESS_MAGIC) {
-            aux->check_signature = 0;
-            return unpack_Z_stream(aux, src_fd, dst_fd);
+            xstate->signature_skipped = 2;
+            return unpack_Z_stream(xstate);
         }
         if (magic2 != GZIP_MAGIC)
@@ -1216 +1225 @@
 //  bytebuffer_max = 0x8000;
     bytebuffer = xmalloc(bytebuffer_max);
-    gunzip_src_fd = src_fd;
+    gunzip_src_fd = xstate->src_fd;
 
  again:
-    if (!check_header_gzip(PASS_STATE aux)) {
+    if (!check_header_gzip(PASS_STATE xstate)) {
         bb_error_msg("corrupted data");
         total = -1;
@@ -1225 +1234 @@
     }
 
-    n = inflate_unzip_internal(PASS_STATE src_fd, dst_fd);
+    n = inflate_unzip_internal(PASS_STATE xstate);
     if (n < 0) {
         total = -1;

branches/3.3/mindi-busybox/archival/libarchive/decompress_uncompress.c

@@ -74 +74 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_Z_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+unpack_Z_stream(transformer_state_t *xstate)
 {
     IF_DESKTOP(long long total_written = 0;)
@@ -103 +103 @@
     int block_mode; /* = BLOCK_MODE; */
 
-    if (check_signature16(aux, src_fd, COMPRESS_MAGIC))
+    if (check_signature16(xstate, COMPRESS_MAGIC))
         return -1;
 
@@ -115 +115 @@
     /* xread isn't good here, we have to return - caller may want
      * to do some cleanup (e.g. delete incomplete unpacked file etc) */
-    if (full_read(src_fd, inbuf, 1) != 1) {
+    if (full_read(xstate->src_fd, inbuf, 1) != 1) {
         bb_error_msg("short read");
         goto err;
@@ -167 +167 @@
 
         if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) {
-            rsize = safe_read(src_fd, inbuf + insize, IBUFSIZ);
+            rsize = safe_read(xstate->src_fd, inbuf + insize, IBUFSIZ);
             if (rsize < 0)
                 bb_error_msg_and_die(bb_msg_read_error);
@@ -275 +275 @@
 
                         if (outpos >= OBUFSIZ) {
-                            xwrite(dst_fd, outbuf, outpos);
+                            xtransformer_write(xstate, outbuf, outpos);
                             IF_DESKTOP(total_written += outpos;)
                             outpos = 0;
@@ -298 +298 @@
             oldcode = incode;
         }
-
     } while (rsize > 0);
 
     if (outpos > 0) {
-        xwrite(dst_fd, outbuf, outpos);
+        xtransformer_write(xstate, outbuf, outpos);
         IF_DESKTOP(total_written += outpos;)
     }

branches/3.3/mindi-busybox/archival/libarchive/decompress_unlzma.c

@@ -46 +46 @@
 
 
-/* Called twice: once at startup (LZMA_FAST only) and once in rc_normalize() */
-static size_inline void rc_read(rc_t *rc)
+/* Called once in rc_do_normalize() */
+static void rc_read(rc_t *rc)
 {
     int buffer_size = safe_read(rc->fd, RC_BUFFER, RC_BUFFER_SIZE);
@@ -54 +54 @@
     if (buffer_size <= 0)
         bb_error_msg_and_die("unexpected EOF");
+    rc->buffer_end = RC_BUFFER + buffer_size;
     rc->ptr = RC_BUFFER;
-    rc->buffer_end = RC_BUFFER + buffer_size;
 }
 
@@ -66 +66 @@
     rc->code = (rc->code << 8) | *rc->ptr++;
 }
+static ALWAYS_INLINE void rc_normalize(rc_t *rc)
+{
+    if (rc->range < (1 << RC_TOP_BITS)) {
+        rc_do_normalize(rc);
+    }
+}
 
 /* Called once */
@@ -79 +85 @@
 
     for (i = 0; i < 5; i++) {
-#if ENABLE_FEATURE_LZMA_FAST
-        if (rc->ptr >= rc->buffer_end)
-            rc_read(rc);
-        rc->code = (rc->code << 8) | *rc->ptr++;
-#else
         rc_do_normalize(rc);
-#endif
-    }
-    rc->range = 0xFFFFFFFF;
+    }
+    rc->range = 0xffffffff;
     return rc;
 }
@@ -95 +95 @@
 {
     free(rc);
-}
-
-static ALWAYS_INLINE void rc_normalize(rc_t *rc)
-{
-    if (rc->range < (1 << RC_TOP_BITS)) {
-        rc_do_normalize(rc);
-    }
 }
 
@@ -121 +114 @@
 
 /* Called 4 times in unlzma loop */
-static speed_inline int rc_get_bit(rc_t *rc, uint16_t *p, int *symbol)
+static ALWAYS_INLINE int rc_get_bit(rc_t *rc, uint16_t *p, int *symbol)
 {
     int ret = rc_is_bit_1(rc, p);
@@ -214 +207 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst_fd)
+unpack_lzma_stream(transformer_state_t *xstate)
 {
     IF_DESKTOP(long long total_written = 0;)
@@ -222 +215 @@
     uint32_t literal_pos_mask;
     uint16_t *p;
-    int num_bits;
-    int num_probs;
     rc_t *rc;
     int i;
@@ -233 +224 @@
     uint32_t rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1;
 
-    if (full_read(src_fd, &header, sizeof(header)) != sizeof(header)
+    if (full_read(xstate->src_fd, &header, sizeof(header)) != sizeof(header)
      || header.pos >= (9 * 5 * 5)
     ) {
@@ -247 +238 @@
     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);
@@ -255 +249 @@
     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;
-
-    rc = rc_init(src_fd); /*, RC_BUFFER_SIZE); */
+    {
+        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(xstate->src_fd); /*, RC_BUFFER_SIZE); */
 
     while (global_pos + buffer_pos < header.dst_size) {
@@ -309 +307 @@
                 buffer_pos = 0;
                 global_pos += header.dict_size;
-                if (full_write(dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size)
+                if (transformer_write(xstate, buffer, header.dict_size) != (ssize_t)header.dict_size)
                     goto bad;
                 IF_DESKTOP(total_written += header.dict_size;)
@@ -318 +316 @@
 #endif
         } else {
+            int num_bits;
             int offset;
             uint16_t *prob2;
@@ -442 +441 @@
                     buffer_pos = 0;
                     global_pos += header.dict_size;
-                    if (full_write(dst_fd, buffer, header.dict_size) != (ssize_t)header.dict_size)
+                    if (transformer_write(xstate, buffer, header.dict_size) != (ssize_t)header.dict_size)
                         goto bad;
                     IF_DESKTOP(total_written += header.dict_size;)
@@ -448 +447 @@
                 len--;
             } while (len != 0 && buffer_pos < header.dst_size);
+            /* FIXME: ...........^^^^^
+             * shouldn't it be "global_pos + buffer_pos < header.dst_size"?
+             */
         }
     }
@@ -454 +456 @@
         IF_NOT_DESKTOP(int total_written = 0; /* success */)
         IF_DESKTOP(total_written += buffer_pos;)
-        if (full_write(dst_fd, buffer, buffer_pos) != (ssize_t)buffer_pos) {
+        if (transformer_write(xstate, buffer, buffer_pos) != (ssize_t)buffer_pos) {
  bad:
             total_written = -1; /* failure */

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

@@ -39 +39 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+unpack_xz_stream(transformer_state_t *xstate)
 {
     enum xz_ret xz_result;
@@ -56 +56 @@
     iobuf.out_size = BUFSIZ;
 
-    if (!aux || aux->check_signature == 0) {
+    if (!xstate || xstate->signature_skipped) {
         /* Preload XZ file signature */
         strcpy((char*)membuf, HEADER_MAGIC);
@@ -68 +68 @@
     while (1) {
         if (iobuf.in_pos == iobuf.in_size) {
-            int rd = safe_read(src_fd, membuf, BUFSIZ);
+            int rd = safe_read(xstate->src_fd, membuf, BUFSIZ);
             if (rd < 0) {
                 bb_error_msg(bb_msg_read_error);
@@ -105 +105 @@
 //              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);
+            xtransformer_write(xstate, iobuf.out, iobuf.out_pos);
             IF_DESKTOP(total += iobuf.out_pos;)
             iobuf.out_pos = 0;

branches/3.3/mindi-busybox/archival/libarchive/filter_accept_list_reassign.c

@@ -29 +29 @@
 
         /* Modify the subarchive handler based on the extension */
+        if (strcmp(name_ptr, "tar") == 0) {
+            archive_handle->dpkg__action_data_subarchive = get_header_tar;
+            return EXIT_SUCCESS;
+        }
         if (ENABLE_FEATURE_SEAMLESS_GZ
          && strcmp(name_ptr, "gz") == 0
@@ -47 +51 @@
             return EXIT_SUCCESS;
         }
+        if (ENABLE_FEATURE_SEAMLESS_XZ
+         && strcmp(name_ptr, "xz") == 0
+        ) {
+            archive_handle->dpkg__action_data_subarchive = get_header_tar_xz;
+            return EXIT_SUCCESS;
+        }
     }
     return EXIT_FAILURE;

branches/3.3/mindi-busybox/archival/libarchive/get_header_ar.c

@@ -9 +9 @@
 #include "ar.h"
 
-static unsigned read_num(const char *str, int base)
+/* WARNING: Clobbers str[len], so fields must be read in reverse order! */
+static unsigned read_num(char *str, int base, int len)
 {
+    int err;
+
+    /* ar fields are fixed length text strings (padded with spaces).
+     * Ensure bb_strtou doesn't read past the field in case the full
+     * width is used. */
+    str[len] = 0;
+
     /* This code works because
      * on misformatted numbers bb_strtou returns all-ones */
-    int err = bb_strtou(str, NULL, base);
+    err = bb_strtou(str, NULL, base);
     if (err == -1)
         bb_error_msg_and_die("invalid ar header");
@@ -52 +60 @@
         bb_error_msg_and_die("invalid ar header");
 
-    /* FIXME: more thorough routine would be in order here
-     * (we have something like that in tar)
-     * but for now we are lax. */
-    ar.formatted.magic[0] = '\0'; /* else 4G-2 file will have size="4294967294`\n..." */
-    typed->size = size = read_num(ar.formatted.size, 10);
+    /*
+     * Note that the fields MUST be read in reverse order as
+     * read_num() clobbers the next byte after the field!
+     * Order is: name, date, uid, gid, mode, size, magic.
+     */
+    typed->size = size = read_num(ar.formatted.size, 10,
+                      sizeof(ar.formatted.size));
 
     /* special filenames have '/' as the first character */
@@ -88 +98 @@
      * after dealing with long filename pseudo file.
      */
-    typed->mode = read_num(ar.formatted.mode, 8);
-    typed->mtime = read_num(ar.formatted.date, 10);
-    typed->uid = read_num(ar.formatted.uid, 10);
-    typed->gid = read_num(ar.formatted.gid, 10);
+    typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode));
+    typed->gid = read_num(ar.formatted.gid, 10, sizeof(ar.formatted.gid));
+    typed->uid = read_num(ar.formatted.uid, 10, sizeof(ar.formatted.uid));
+    typed->mtime = read_num(ar.formatted.date, 10, sizeof(ar.formatted.date));
 
 #if ENABLE_FEATURE_AR_LONG_FILENAMES
@@ -99 +109 @@
         /* The number after the '/' indicates the offset in the ar data section
          * (saved in ar_long_names) that conatains the real filename */
-        long_offset = read_num(&ar.formatted.name[1], 10);
+        long_offset = read_num(&ar.formatted.name[1], 10,
+                       sizeof(ar.formatted.name) - 1);
         if (long_offset >= ar_long_name_size) {
             bb_error_msg_and_die("can't resolve long filename");

branches/3.3/mindi-busybox/archival/libarchive/get_header_cpio.c

@@ -38 +38 @@
     archive_handle->offset += 110;
 
-    if (strncmp(&cpio_header[0], "07070", 5) != 0
+    if (!is_prefixed_with(&cpio_header[0], "07070")
      || (cpio_header[5] != '1' && cpio_header[5] != '2')
     ) {
@@ -53 +53 @@
         bb_error_msg_and_die("damaged cpio file");
     file_header->mode = mode;
+    /* "cpio -R USER:GRP" support: */
+    if (archive_handle->cpio__owner.uid != (uid_t)-1L)
+        uid = archive_handle->cpio__owner.uid;
+    if (archive_handle->cpio__owner.gid != (gid_t)-1L)
+        gid = archive_handle->cpio__owner.gid;
     file_header->uid = uid;
     file_header->gid = gid;
@@ -76 +81 @@
     data_align(archive_handle, 4);
 
-    if (strcmp(file_header->name, "TRAILER!!!") == 0) {
+    if (strcmp(file_header->name, cpio_TRAILER) == 0) {
         /* Always round up. ">> 9" divides by 512 */
         archive_handle->cpio__blocks = (uoff_t)(archive_handle->offset + 511) >> 9;

branches/3.3/mindi-busybox/archival/libarchive/get_header_tar.c

@@ -17 +17 @@
 typedef uint32_t aliased_uint32_t FIX_ALIASING;
 typedef off_t    aliased_off_t    FIX_ALIASING;
-
-
-const char* FAST_FUNC strip_unsafe_prefix(const char *str)
-{
-    const char *cp = str;
-    while (1) {
-        char *cp2;
-        if (*cp == '/') {
-            cp++;
-            continue;
-        }
-        if (strncmp(cp, "/../"+1, 3) == 0) {
-            cp += 3;
-            continue;
-        }
-        cp2 = strstr(cp, "/../");
-        if (!cp2)
-            break;
-        cp = cp2 + 4;
-    }
-    if (cp != str) {
-        static smallint warned = 0;
-        if (!warned) {
-            warned = 1;
-            bb_error_msg("removing leading '%.*s' from member names",
-                (int)(cp - str), str);
-        }
-    }
-    return cp;
-}
 
 /* NB: _DESTROYS_ str[len] character! */
@@ -91 +61 @@
 #define GET_OCTAL(a) getOctal((a), sizeof(a))
 
+#define TAR_EXTD (ENABLE_FEATURE_TAR_GNU_EXTENSIONS || ENABLE_FEATURE_TAR_SELINUX)
+#if !TAR_EXTD
+#define process_pax_hdr(archive_handle, sz, global) \
+    process_pax_hdr(archive_handle, sz)
+#endif
 /* "global" is 0 or 1 */
 static void process_pax_hdr(archive_handle_t *archive_handle, unsigned sz, int global)
 {
+#if !TAR_EXTD
+    unsigned blk_sz = (sz + 511) & (~511);
+    seek_by_read(archive_handle->src_fd, blk_sz);
+#else
+    unsigned blk_sz = (sz + 511) & (~511);
     char *buf, *p;
-    unsigned blk_sz;
-
-    blk_sz = (sz + 511) & (~511);
+
     p = buf = xmalloc(blk_sz + 1);
     xread(archive_handle->src_fd, buf, blk_sz);
@@ -116 +94 @@
         p += len;
         sz -= len;
-        if ((int)sz < 0
+        if (
+        /** (int)sz < 0 - not good enough for huge malicious VALUE of 2^32-1 */
+            (int)(sz|len) < 0 /* this works */
          || len == 0
          || errno != EINVAL
@@ -133 +113 @@
         value = end + 1;
 
-#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
-        if (!global && strncmp(value, "path=", sizeof("path=") - 1) == 0) {
+# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+        if (!global && is_prefixed_with(value, "path=")) {
             value += sizeof("path=") - 1;
             free(archive_handle->tar__longname);
@@ -140 +120 @@
             continue;
         }
-#endif
-
-#if ENABLE_FEATURE_TAR_SELINUX
+# endif
+
+# if ENABLE_FEATURE_TAR_SELINUX
         /* Scan for SELinux contexts, via "RHT.security.selinux" keyword.
          * This is what Red Hat's patched version of tar uses.
          */
-# define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux"
-        if (strncmp(value, SELINUX_CONTEXT_KEYWORD"=", sizeof(SELINUX_CONTEXT_KEYWORD"=") - 1) == 0) {
+#  define SELINUX_CONTEXT_KEYWORD "RHT.security.selinux"
+        if (is_prefixed_with(value, SELINUX_CONTEXT_KEYWORD"=")) {
             value += sizeof(SELINUX_CONTEXT_KEYWORD"=") - 1;
             free(archive_handle->tar__sctx[global]);
@@ -153 +133 @@
             continue;
         }
-#endif
+# endif
     }
 
     free(buf);
+#endif
 }
 
@@ -199 +180 @@
      * saw zero block directly before this. */
     if (i == 0) {
-        xfunc_error_retval = 0;
- short_read:
-        bb_error_msg_and_die("short read");
+        bb_error_msg("short read");
+        /* this merely signals end of archive, not exit(1): */
+        return EXIT_FAILURE;
     }
     if (i != 512) {
         IF_FEATURE_TAR_AUTODETECT(goto autodetect;)
-        goto short_read;
+        bb_error_msg_and_die("short read");
     }
 
@@ -222 +203 @@
             while (full_read(archive_handle->src_fd, &tar, 512) == 512)
                 continue;
-            return EXIT_FAILURE;
+            return EXIT_FAILURE; /* "end of archive" */
         }
         archive_handle->tar__end = 1;
-        return EXIT_SUCCESS;
+        return EXIT_SUCCESS; /* "decoded one header" */
     }
     archive_handle->tar__end = 0;
@@ -231 +212 @@
     /* Check header has valid magic, "ustar" is for the proper tar,
      * five NULs are for the old tar format  */
-    if (strncmp(tar.magic, "ustar", 5) != 0
+    if (!is_prefixed_with(tar.magic, "ustar")
      && (!ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
          || memcmp(tar.magic, "\0\0\0\0", 5) != 0)
@@ -242 +223 @@
         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");
@@ -379 +360 @@
         file_header->mode |= S_IFIFO;
         goto size0;
+    case 'g':   /* pax global header */
+    case 'x': { /* pax extended header */
+        if ((uoff_t)file_header->size > 0xfffff) /* paranoia */
+            goto skip_ext_hdr;
+        process_pax_hdr(archive_handle, file_header->size, (tar.typeflag == 'g'));
+        goto again_after_align;
 #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+/* See http://www.gnu.org/software/tar/manual/html_node/Extensions.html */
     case 'L':
         /* free: paranoia: tar with several consecutive longnames */
@@ -399 +387 @@
         /* return get_header_tar(archive_handle); */
         goto again;
-    case 'D':   /* GNU dump dir */
-    case 'M':   /* Continuation of multi volume archive */
-    case 'N':   /* Old GNU for names > 100 characters */
-    case 'S':   /* Sparse file */
-    case 'V':   /* Volume header */
-#endif
-    case 'g':   /* pax global header */
-    case 'x': { /* pax extended header */
-        if ((uoff_t)file_header->size > 0xfffff) /* paranoia */
-            goto skip_ext_hdr;
-        process_pax_hdr(archive_handle, file_header->size, (tar.typeflag == 'g'));
-        goto again_after_align;
+/*
+ *  case 'S':   // Sparse file
+ * Was seen in the wild. Not supported (yet?).
+ * See https://www.gnu.org/software/tar/manual/html_section/tar_92.html
+ * for the format. (An "Old GNU Format" was seen, not PAX formats).
+ */
+//  case 'D':   /* GNU dump dir */
+//  case 'M':   /* Continuation of multi volume archive */
+//  case 'N':   /* Old GNU for names > 100 characters */
+//  case 'V':   /* Volume header */
+#endif
     }
  skip_ext_hdr:
@@ -441 +428 @@
     /* Everything up to and including last ".." component is stripped */
     overlapping_strcpy(file_header->name, strip_unsafe_prefix(file_header->name));
+//TODO: do the same for file_header->link_target?
 
     /* Strip trailing '/' in directories */
@@ -472 +460 @@
     free(file_header->tar__gname);
 #endif
-    return EXIT_SUCCESS;
+    return EXIT_SUCCESS; /* "decoded one header" */
 }

branches/3.3/mindi-busybox/archival/libarchive/get_header_tar_bz2.c

@@ -12 +12 @@
     archive_handle->seek = seek_by_read;
 
-    open_transformer_with_sig(archive_handle->src_fd, unpack_bz2_stream, "bunzip2");
+    fork_transformer_with_sig(archive_handle->src_fd, unpack_bz2_stream, "bunzip2");
     archive_handle->offset = 0;
     while (get_header_tar(archive_handle) == EXIT_SUCCESS)

branches/3.3/mindi-busybox/archival/libarchive/get_header_tar_gz.c

@@ -12 +12 @@
     archive_handle->seek = seek_by_read;
 
-    open_transformer_with_sig(archive_handle->src_fd, unpack_gz_stream, "gunzip");
+    fork_transformer_with_sig(archive_handle->src_fd, unpack_gz_stream, "gunzip");
     archive_handle->offset = 0;
     while (get_header_tar(archive_handle) == EXIT_SUCCESS)

branches/3.3/mindi-busybox/archival/libarchive/get_header_tar_lzma.c

@@ -15 +15 @@
     archive_handle->seek = seek_by_read;
 
-    open_transformer_with_sig(archive_handle->src_fd, unpack_lzma_stream, "unlzma");
+    fork_transformer_with_sig(archive_handle->src_fd, unpack_lzma_stream, "unlzma");
     archive_handle->offset = 0;
     while (get_header_tar(archive_handle) == EXIT_SUCCESS)

branches/3.3/mindi-busybox/archival/libarchive/liblzo.h

@@ -77 +77 @@
 #    define NEED_IP(x) \
             if ((unsigned)(ip_end - ip) < (unsigned)(x))  goto input_overrun
+#    define TEST_IV(x)          if ((x) > (unsigned)0 - (511)) goto input_overrun
 
 #    undef TEST_OP              /* don't need both of the tests here */
@@ -82 +83 @@
 #    define NEED_OP(x) \
             if ((unsigned)(op_end - op) < (unsigned)(x))  goto output_overrun
+#    define TEST_OV(x)          if ((x) > (unsigned)0 - (511)) goto output_overrun
 
 #define HAVE_ANY_OP 1

branches/3.3/mindi-busybox/archival/libarchive/lzo1x_9x.c

@@ -72 +72 @@
 
     unsigned r1_lit;
-
 } lzo1x_999_t;
 
@@ -95 +94 @@
 
 #if defined(LZO_UNALIGNED_OK_2)
-#  define HEAD2(b,p)      (* (uint16_t *) &(b[p]))
+#  define HEAD2(b,p)      (* (bb__aliased_uint16_t *) &(b[p]))
 #else
 #  define HEAD2(b,p)      (b[p] ^ ((unsigned)b[p+1]<<8))
@@ -466 +465 @@
     }
 
-    s->m_len = 1;
     s->m_len = 1;
 #ifdef SWD_BEST_OFF

branches/3.3/mindi-busybox/archival/libarchive/lzo1x_d.c

@@ -93 +93 @@
                 NEED_IP(1);
             }
+            TEST_IV(t);
             t += 15 + *ip++;
         }
@@ -225 +226 @@
                         NEED_IP(1);
                     }
+                    TEST_IV(t);
                     t += 31 + *ip++;
                 }
@@ -266 +268 @@
                         NEED_IP(1);
                     }
+                    TEST_IV(t);
                     t += 7 + *ip++;
                 }

branches/3.3/mindi-busybox/archival/libarchive/open_transformer.c

@@ -7 +7 @@
 #include "bb_archive.h"
 
-void FAST_FUNC init_transformer_aux_data(transformer_aux_data_t *aux)
-{
-    memset(aux, 0, sizeof(*aux));
-}
-
-int FAST_FUNC check_signature16(transformer_aux_data_t *aux, int src_fd, unsigned magic16)
-{
-    if (aux && aux->check_signature) {
+void FAST_FUNC init_transformer_state(transformer_state_t *xstate)
+{
+    memset(xstate, 0, sizeof(*xstate));
+}
+
+int FAST_FUNC check_signature16(transformer_state_t *xstate, unsigned magic16)
+{
+    if (!xstate->signature_skipped) {
         uint16_t magic2;
-        if (full_read(src_fd, &magic2, 2) != 2 || magic2 != magic16) {
+        if (full_read(xstate->src_fd, &magic2, 2) != 2 || magic2 != magic16) {
             bb_error_msg("invalid magic");
-#if 0 /* possible future extension */
-            if (aux->check_signature > 1)
-                xfunc_die();
-#endif
             return -1;
         }
+        xstate->signature_skipped = 2;
     }
     return 0;
+}
+
+ssize_t FAST_FUNC transformer_write(transformer_state_t *xstate, const void *buf, size_t bufsize)
+{
+    ssize_t nwrote;
+
+    if (xstate->mem_output_size_max != 0) {
+        size_t pos = xstate->mem_output_size;
+        size_t size;
+
+        size = (xstate->mem_output_size += bufsize);
+        if (size > xstate->mem_output_size_max) {
+            free(xstate->mem_output_buf);
+            xstate->mem_output_buf = NULL;
+            bb_perror_msg("buffer %u too small", (unsigned)xstate->mem_output_size_max);
+            nwrote = -1;
+            goto ret;
+        }
+        xstate->mem_output_buf = xrealloc(xstate->mem_output_buf, size + 1);
+        memcpy(xstate->mem_output_buf + pos, buf, bufsize);
+        xstate->mem_output_buf[size] = '\0';
+        nwrote = bufsize;
+    } else {
+        nwrote = full_write(xstate->dst_fd, buf, bufsize);
+        if (nwrote != (ssize_t)bufsize) {
+            bb_perror_msg("write");
+            nwrote = -1;
+            goto ret;
+        }
+    }
+ ret:
+    return nwrote;
+}
+
+ssize_t FAST_FUNC xtransformer_write(transformer_state_t *xstate, const void *buf, size_t bufsize)
+{
+    ssize_t nwrote = transformer_write(xstate, buf, bufsize);
+    if (nwrote != (ssize_t)bufsize) {
+        xfunc_die();
+    }
+    return nwrote;
 }
 
@@ -35 +73 @@
         /* block waiting for any child */
         if (wait(&status) < 0)
+//FIXME: check EINTR?
             return; /* probably there are no children */
         goto check_status;
@@ -42 +81 @@
     for (;;) {
         if (wait_any_nohang(&status) < 0)
+//FIXME: check EINTR?
             /* wait failed?! I'm confused... */
             return;
  check_status:
-        if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+        /*if (WIFEXITED(status) && WEXITSTATUS(status) == 0)*/
+        /* On Linux, the above can be checked simply as: */
+        if (status == 0)
             /* this child exited with 0 */
             continue;
-        /* Cannot happen?
-        if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???; */
+        /* Cannot happen:
+        if (!WIFSIGNALED(status) && !WIFEXITED(status)) ???;
+         */
         bb_got_signal = 1;
     }
@@ -56 +99 @@
 /* transformer(), more than meets the eye */
 #if BB_MMU
-void FAST_FUNC open_transformer(int fd,
-    int check_signature,
-    IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd)
+void FAST_FUNC fork_transformer(int fd,
+    int signature_skipped,
+    IF_DESKTOP(long long) int FAST_FUNC (*transformer)(transformer_state_t *xstate)
 )
 #else
-void FAST_FUNC open_transformer(int fd, const char *transform_prog)
+void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
 #endif
 {
@@ -75 +118 @@
 #if BB_MMU
         {
-            transformer_aux_data_t aux;
-            init_transformer_aux_data(&aux);
-            aux.check_signature = check_signature;
-            transformer(&aux, fd, fd_pipe.wr);
+            IF_DESKTOP(long long) int r;
+            transformer_state_t xstate;
+            init_transformer_state(&xstate);
+            xstate.signature_skipped = signature_skipped;
+            xstate.src_fd = fd;
+            xstate.dst_fd = fd_pipe.wr;
+            r = transformer(&xstate);
             if (ENABLE_FEATURE_CLEAN_UP) {
                 close(fd_pipe.wr); /* send EOF */
@@ -84 +130 @@
             }
             /* must be _exit! bug was actually seen here */
-            _exit(EXIT_SUCCESS);
+            _exit(/*error if:*/ r < 0);
         }
 #else
@@ -113 +159 @@
  * 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)
+static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_compressed)
 {
     union {
@@ -120 +166 @@
         uint32_t b32[1];
     } magic;
-    int offset = -2;
-    USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd);)
-    USE_FOR_NOMMU(const char *xformer_prog;)
+    transformer_state_t *xstate;
+
+    xstate = xzalloc(sizeof(*xstate));
+    xstate->src_fd = fd;
+    xstate->signature_skipped = 2;
 
     /* .gz and .bz2 both have 2-byte signature, and their
@@ -130 +178 @@
      && magic.b16[0] == GZIP_MAGIC
     ) {
-        USE_FOR_MMU(xformer = unpack_gz_stream;)
-        USE_FOR_NOMMU(xformer_prog = "gunzip";)
+        xstate->xformer = unpack_gz_stream;
+        USE_FOR_NOMMU(xstate->xformer_prog = "gunzip";)
+        goto found_magic;
+    }
+    if (ENABLE_FEATURE_SEAMLESS_Z
+     && magic.b16[0] == COMPRESS_MAGIC
+    ) {
+        xstate->xformer = unpack_Z_stream;
+        USE_FOR_NOMMU(xstate->xformer_prog = "uncompress";)
         goto found_magic;
     }
@@ -137 +192 @@
      && magic.b16[0] == BZIP2_MAGIC
     ) {
-        USE_FOR_MMU(xformer = unpack_bz2_stream;)
-        USE_FOR_NOMMU(xformer_prog = "bunzip2";)
+        xstate->xformer = unpack_bz2_stream;
+        USE_FOR_NOMMU(xstate->xformer_prog = "bunzip2";)
         goto found_magic;
     }
@@ -144 +199 @@
      && magic.b16[0] == XZ_MAGIC1
     ) {
-        offset = -6;
+        xstate->signature_skipped = 6;
         xread(fd, magic.b32, sizeof(magic.b32[0]));
         if (magic.b32[0] == XZ_MAGIC2) {
-            USE_FOR_MMU(xformer = unpack_xz_stream;)
-            USE_FOR_NOMMU(xformer_prog = "unxz";)
+            xstate->xformer = unpack_xz_stream;
+            USE_FOR_NOMMU(xstate->xformer_prog = "unxz";)
             goto found_magic;
         }
@@ -154 +209 @@
 
     /* 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")
             " magic");
-    xlseek(fd, offset, SEEK_CUR);
-    return 1;
+
+    /* Some callers expect this function to "consume" fd
+     * even if data is not compressed. In this case,
+     * we return a state with trivial transformer.
+     */
+//  USE_FOR_MMU(xstate->xformer = copy_stream;)
+//  USE_FOR_NOMMU(xstate->xformer_prog = "cat";)
 
  found_magic:
+    return xstate;
+}
+
+/* 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_compressed)
+{
+    transformer_state_t *xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
+
+    if (!xstate || !xstate->xformer) {
+        free(xstate);
+        return 1;
+    }
+
 # if BB_MMU
-    open_transformer_with_no_sig(fd, xformer);
+    fork_transformer_with_no_sig(xstate->src_fd, xstate->xformer);
 # else
-    /* NOMMU version of open_transformer execs
+    /* NOMMU version of fork_transformer execs
      * an external unzipper that wants
-     * file position at the start of the file */
-    xlseek(fd, offset, SEEK_CUR);
-    open_transformer_with_sig(fd, xformer, xformer_prog);
+     * file position at the start of the file.
+     */
+    xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+    xstate->signature_skipped = 0;
+    fork_transformer_with_sig(xstate->src_fd, xstate->xformer, xstate->xformer_prog);
 # endif
+    free(xstate);
     return 0;
 }
 
-int FAST_FUNC open_zipped(const char *fname)
-{
-    char *sfx;
+static transformer_state_t *open_transformer(const char *fname, int fail_if_not_compressed)
+{
+    transformer_state_t *xstate;
     int fd;
 
     fd = open(fname, O_RDONLY);
     if (fd < 0)
-        return fd;
-
-    sfx = strrchr(fname, '.');
-    if (sfx) {
-        sfx++;
-        if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0)
-            /* .lzma has no header/signature, just trust it */
-            open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma");
-        else
-        if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0)
-         || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0)
-         || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0)
-        ) {
-            setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1);
-        }
-    }
-
+        return NULL;
+
+    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) {
+            xstate = xzalloc(sizeof(*xstate));
+            xstate->src_fd = fd;
+            xstate->xformer = unpack_lzma_stream;
+            USE_FOR_NOMMU(xstate->xformer_prog = "unlzma";)
+            return xstate;
+        }
+    }
+
+    xstate = setup_transformer_on_fd(fd, fail_if_not_compressed);
+
+    return xstate;
+}
+
+int FAST_FUNC open_zipped(const char *fname, int fail_if_not_compressed)
+{
+    int fd;
+    transformer_state_t *xstate;
+
+    xstate = open_transformer(fname, fail_if_not_compressed);
+    if (!xstate)
+        return -1;
+
+    fd = xstate->src_fd;
+# if BB_MMU
+    if (xstate->xformer) {
+        fork_transformer_with_no_sig(fd, xstate->xformer);
+    } else {
+        /* the file is not compressed */
+        xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+        xstate->signature_skipped = 0;
+    }
+# else
+    /* NOMMU can't avoid the seek :( */
+    xlseek(fd, - xstate->signature_skipped, SEEK_CUR);
+    xstate->signature_skipped = 0;
+    if (xstate->xformer) {
+        fork_transformer_with_sig(fd, xstate->xformer, xstate->xformer_prog);
+    } /* else: the file is not compressed */
+# endif
+
+    free(xstate);
     return fd;
 }
 
-#endif /* SEAMLESS_COMPRESSION */
-
 void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_p)
 {
+# if 1
+    transformer_state_t *xstate;
+    char *image;
+
+    xstate = open_transformer(fname, /*fail_if_not_compressed:*/ 0);
+    if (!xstate) /* file open error */
+        return NULL;
+
+    image = NULL;
+    if (xstate->xformer) {
+        /* In-memory decompression */
+        xstate->mem_output_size_max = maxsz_p ? *maxsz_p : (size_t)(INT_MAX - 4095);
+        xstate->xformer(xstate);
+        if (xstate->mem_output_buf) {
+            image = xstate->mem_output_buf;
+            if (maxsz_p)
+                *maxsz_p = xstate->mem_output_size;
+        }
+    } else {
+        /* File is not compressed */
+//FIXME: avoid seek
+        xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
+        xstate->signature_skipped = 0;
+        image = xmalloc_read(xstate->src_fd, maxsz_p);
+    }
+
+    if (!image)
+        bb_perror_msg("read error from '%s'", fname);
+    close(xstate->src_fd);
+    free(xstate);
+    return image;
+# else
+    /* This version forks a subprocess - much more expensive */
     int fd;
     char *image;
 
-    fd = open_zipped(fname);
+    fd = open_zipped(fname, /*fail_if_not_compressed:*/ 0);
     if (fd < 0)
         return NULL;
@@ -217 +356 @@
         bb_perror_msg("read error from '%s'", fname);
     close(fd);
-
     return image;
-}
+# endif
+}
+
+#endif /* SEAMLESS_COMPRESSION */

branches/3.3/mindi-busybox/archival/libarchive/unpack_ar_archive.c

@@ -13 +13 @@
 
     xread(ar_archive->src_fd, magic, AR_MAGIC_LEN);
-    if (strncmp(magic, AR_MAGIC, AR_MAGIC_LEN) != 0) {
+    if (!is_prefixed_with(magic, AR_MAGIC)) {
         bb_error_msg_and_die("invalid ar magic");
     }

branches/3.3/mindi-busybox/archival/libarchive/unxz/README

@@ -8 +8 @@
     XZ Embedded was written for use in the Linux kernel, but the code can
     be easily used in other environments too, including regular userspace
-    applications.
+    applications. See userspace/xzminidec.c for an example program.
 
     This README contains information that is useful only when the copy
@@ -56 +56 @@
     care than just using 32-bit integer instead of 64-bit).
 
-    If you use GCC, try to use a recent version. For example, on x86,
+    If you use GCC, try to use a recent version. For example, on x86-32,
     xz_dec_lzma2.c compiled with GCC 3.3.6 is 15-25 % slower than when
     compiled with GCC 4.3.3.
@@ -94 +94 @@
 
         #define             Instruction set     BCJ filter endianness
-        XZ_DEC_X86          x86 or x86-64       Little endian only
+        XZ_DEC_X86          x86-32 or x86-64    Little endian only
         XZ_DEC_POWERPC      PowerPC             Big endian only
         XZ_DEC_IA64         Itanium (IA-64)     Big or little endian

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz.h

@@ -18 +18 @@
 #   include <stddef.h>
 #   include <stdint.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
@@ -71 +75 @@
  *                          is still possible in multi-call mode by simply
  *                          calling xz_dec_run() again.
- *                          NOTE: This return value is used only if
+ *                          Note that this return value is used only if
  *                          XZ_DEC_ANY_CHECK was defined at build time,
  *                          which is not used in the kernel. Unsupported
@@ -106 +110 @@
  *
  * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
- * is too small, or the compressed input is corrupt in a way that makes the
+ * is too small or the compressed input is corrupt in a way that makes the
  * decoder produce more output than the caller expected. When it is
  * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
@@ -208 +212 @@
  * See enum xz_ret for details.
  *
- * NOTE: If an error occurs in single-call mode (return value is not
- * XZ_STREAM_END), b->in_pos and b->out_pos are not modified, and the
+ * Note that if an error occurs in single-call mode (return value is not
+ * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
  * contents of the output buffer from b->out[b->out_pos] onward are
  * undefined. This is true even after XZ_BUF_ERROR, because with some filter
@@ -269 +273 @@
         const uint8_t *buf, size_t size, uint32_t crc);
 #endif
-#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_dec_bcj.c

@@ -78 +78 @@
 #ifdef XZ_DEC_X86
 /*
- * This is macro used to test the most significant byte of a memory address
+ * This is used to test the most significant byte of a memory address
  * in an x86 instruction.
  */
-#define bcj_x86_test_msbyte(b) ((b) == 0x00 || (b) == 0xFF)
+static inline int bcj_x86_test_msbyte(uint8_t b)
+{
+    return b == 0x00 || b == 0xFF;
+}
 
 static noinline_for_stack size_t XZ_FUNC bcj_x86(
@@ -444 +447 @@
      * in the output buffer. If everything cannot be filtered, copy it
      * to temp and rewind the output buffer position accordingly.
+     *
+     * This needs to be always run when temp.size == 0 to handle a special
+     * case where the output buffer is full and the next filter has no
+     * more output coming but hasn't returned XZ_STREAM_END yet.
      */
-    if (s->temp.size < b->out_size - b->out_pos) {
+    if (s->temp.size < b->out_size - b->out_pos || s->temp.size == 0) {
         out_start = b->out_pos;
         memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
@@ -468 +475 @@
         b->out_pos -= s->temp.size;
         memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
+
+        /*
+         * If there wasn't enough input to the next filter to fill
+         * the output buffer with unfiltered data, there's no point
+         * to try decoding more data to temp.
+         */
+        if (b->out_pos + s->temp.size < b->out_size)
+            return XZ_OK;
     }
 
     /*
-     * If we have unfiltered data in temp, try to fill by decoding more
-     * data from the next filter. Apply the BCJ filter on temp. Then we
-     * hopefully can fill the actual output buffer by copying filtered
-     * data from temp. A mix of filtered and unfiltered data may be left
-     * in temp; it will be taken care on the next call to this function.
+     * We have unfiltered data in temp. If the output buffer isn't full
+     * yet, try to fill the temp buffer by decoding more data from the
+     * next filter. Apply the BCJ filter on temp. Then we hopefully can
+     * fill the actual output buffer by copying filtered data from temp.
+     * A mix of filtered and unfiltered data may be left in temp; it will
+     * be taken care on the next call to this function.
      */
-    if (s->temp.size > 0) {
+    if (b->out_pos < b->out_size) {
         /* Make b->out{,_pos,_size} temporarily point to s->temp. */
         s->out = b->out;

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_dec_lzma2.c

@@ -408 +408 @@
         b->out_pos += copy_size;
         b->in_pos += copy_size;
-
     }
 }
@@ -973 +972 @@
             tmp = b->in[b->in_pos++];
 
+            if (tmp == 0x00)
+                return XZ_STREAM_END;
+
             if (tmp >= 0xE0 || tmp == 0x01) {
                 s->lzma2.need_props = true;
@@ -994 +996 @@
                     s->lzma2.next_sequence
                             = SEQ_PROPERTIES;
-
                 } else if (s->lzma2.need_props) {
                     return XZ_DATA_ERROR;
-
                 } else {
                     s->lzma2.next_sequence
@@ -1005 +1005 @@
                 }
             } else {
-                if (tmp == 0x00)
-                    return XZ_STREAM_END;
-
                 if (tmp > 0x02)
                     return XZ_DATA_ERROR;
@@ -1082 +1079 @@
                 rc_reset(&s->rc);
                 s->lzma2.sequence = SEQ_CONTROL;
-
             } else if (b->out_pos == b->out_size
                     || (b->in_pos == b->in_size

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_dec_stream.c

@@ -354 +354 @@
 
         s->pos += 8;
-
     } while (s->pos < 32);
 
@@ -754 +753 @@
             b->out_pos = out_start;
         }
-
     } else if (ret == XZ_OK && in_start == b->in_pos
             && out_start == b->out_pos) {

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_stream.h

@@ -26 +26 @@
 #define STREAM_HEADER_SIZE 12
 
-#define HEADER_MAGIC "\3757zXZ\0"
+#define HEADER_MAGIC "\3757zXZ"
 #define HEADER_MAGIC_SIZE 6
 
@@ -33 +33 @@
 
 /*
- * Variable-length integer can hold a 63-bit unsigned integer, or a special
- * value to indicate that the value is unknown.
+ * Variable-length integer can hold a 63-bit unsigned integer or a special
+ * value indicating that the value is unknown.
+ *
+ * Experimental: vli_type can be defined to uint32_t to save a few bytes
+ * in code size (no effect on speed). Doing so limits the uncompressed and
+ * compressed size of the file to less than 256 MiB and may also weaken
+ * error detection slightly.
  */
 typedef uint64_t vli_type;