Merge branch 'busybox' into merge

3 files changed, 79 insertions, 54 deletions

diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index cf07f71df..c0332d414 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -39,7 +39,8 @@ typedef struct huft_t {
         unsigned char e;        /* number of extra bits or operation */
         unsigned char b;        /* number of bits in this code or subcode */
         union {
-                unsigned short n;       /* literal, length base, or distance base */
+                unsigned n;     /* literal, length base, or distance base */
+                /* ^^^^^ was "unsigned short", but that results in larger code */
                 struct huft_t *t;       /* pointer to next level of table */
         } v;
 } huft_t;
@@ -184,29 +185,26 @@ static const uint16_t mask_bits[] ALIGN2 = {
         0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
 };
 
-/* Copy lengths for literal codes 257..285 */
-static const uint16_t cplens[] ALIGN2 = {
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59,
-        67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
+/* Put lengths/offsets and extra bits in a struct of arrays
+ * to make calls to huft_build() have one fewer parameter.
+ */
+struct cp_ext {
+        uint16_t cp[31];
+        uint8_t ext[31];
 };
-
+/* Copy lengths and extra bits for literal codes 257..285 */
 /* note: see note #13 above about the 258 in this list. */
-/* Extra bits for literal codes 257..285 */
-static const uint8_t cplext[] ALIGN1 = {
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5,
-        5, 5, 5, 0, 99, 99
-}; /* 99 == invalid */
-
-/* Copy offsets for distance codes 0..29 */
-static const uint16_t cpdist[] ALIGN2 = {
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513,
-        769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577
+static const struct cp_ext lit = {
+        /*257 258 259 260 261 262 263 264 265 266 267 268 269 270 271  272  273  274  275  276   277   278   279   280   281   282   283    284    285 */
+        /*0   1   2   3   4   5   6   7   8   9   10  11  12  13   14   15   16   17   18   19    20    21    22    23    24    25    26     27     28     29  30 */
+        { 3,  4,  5,  6,  7,  8,  9,  10, 11, 13, 15, 17, 19, 23,  27,  31,  35,  43,  51,  59,   67,   83,   99,  115,  131,  163,  195,   227,   258,     0, 0  },
+        { 0,  0,  0,  0,  0,  0,  0,   0,  1,  1,  1,  1,  2,  2,   2,   2,   3,   3,   3,   3,    4,    4,    4,    4,    5,    5,    5,     5,     0,    99, 99 } /* 99 == invalid */
 };
-
-/* Extra bits for distance codes */
-static const uint8_t cpdext[] ALIGN1 = {
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10,
-        11, 11, 12, 12, 13, 13
+/* Copy offsets and extra bits for distance codes 0..29 */
+static const struct cp_ext dist = {
+        /*0   1   2   3   4   5   6   7   8   9   10  11  12  13   14   15   16   17   18   19    20    21    22    23    24    25    26     27     28     29 */
+        { 1,  2,  3,  4,  5,  7,  9,  13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 },
+        { 0,  0,  0,  0,  1,  1,  2,   2,  3,  3,  4,  4,  5,  5,   6,   6,   7,   7,   8,   8,    9,    9,   10,   10,   11,   11,   12,    12,    13,    13 }
 };
 
 /* Tables for deflate from PKZIP's appnote.txt. */
@@ -277,22 +275,25 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current
 
 
 /* Given a list of code lengths and a maximum table size, make a set of
- * tables to decode that set of codes.  Return zero on success, one if
- * the given code set is incomplete (the tables are still built in this
- * case), two if the input is invalid (an oversubscribed set of lengths)
- * - in this case stores NULL in *t.
+ * tables to decode that set of codes.
  *
  * b:   code lengths in bits (all assumed <= BMAX)
  * n:   number of codes (assumed <= N_MAX)
  * s:   number of simple-valued codes (0..s-1)
- * d:   list of base values for non-simple codes
- * e:   list of extra bits for non-simple codes
- * t:   result: starting table
+ * cp_ext->cp,ext: list of base values/extra bits for non-simple codes
  * m:   maximum lookup bits, returns actual
+ * result: starting table
+ *
+ * On error, returns a value with lowest-bit set on error.
+ * It can be just the value of 0x1,
+ * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table
+ * is given: "fixed inflate" decoder feeds us such data.
  */
-static int huft_build(const unsigned *b, const unsigned n,
-                        const unsigned s, const unsigned short *d,
-                        const unsigned char *e, huft_t **t, unsigned *m)
+#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
+#define ERR_RET     ((huft_t*)(uintptr_t)1)
+static huft_t* huft_build(const unsigned *b, const unsigned n,
+                        const unsigned s, const struct cp_ext *cp_ext,
+                        unsigned *m)
 {
         unsigned a;             /* counter for codes of length k */
         unsigned c[BMAX + 1];   /* bit length count table */
@@ -314,12 +315,12 @@ static int huft_build(const unsigned *b, const unsigned n,
         unsigned *xp;           /* pointer into x */
         int y;                  /* number of dummy codes added */
         unsigned z;             /* number of entries in current table */
+        huft_t *result;
+        huft_t **t;
 
         /* Length of EOB code, if any */
         eob_len = n > 256 ? b[256] : BMAX;
 
-        *t = NULL;
-
         /* Generate counts for each bit length */
         memset(c, 0, sizeof(c));
         p = b;
@@ -335,9 +336,8 @@ static int huft_build(const unsigned *b, const unsigned n,
                 q[1].b = 1;
                 q[2].e = 99;    /* invalid code marker */
                 q[2].b = 1;
-                *t = q + 1;
                 *m = 1;
-                return 0;
+                return q + 1;
         }
 
         /* Find minimum and maximum length, bound *m by those */
@@ -353,11 +353,11 @@ static int huft_build(const unsigned *b, const unsigned n,
         for (y = 1 << j; j < i; j++, y <<= 1) {
                 y -= c[j];
                 if (y < 0)
-                        return 2; /* bad input: more codes than bits */
+                        return ERR_RET; /* bad input: more codes than bits */
         }
         y -= c[i];
         if (y < 0)
-                return 2;
+                return ERR_RET;
         c[i] += y;
 
         /* Generate starting offsets into the value table for each length */
@@ -384,6 +384,8 @@ static int huft_build(const unsigned *b, const unsigned n,
         } while (++i < n);
 
         /* Generate the Huffman codes and for each, make the table entries */
+        result = ERR_RET;
+        t = &result;
         x[0] = i = 0;   /* first Huffman code is zero */
         p = v;          /* grab values in bit order */
         htl = -1;       /* no tables yet--level -1 */
@@ -449,8 +451,8 @@ static int huft_build(const unsigned *b, const unsigned n,
                                 r.e = (unsigned char) (*p < 256 ? 16 : 15);     /* 256 is EOB code */
                                 r.v.n = (unsigned short) (*p++); /* simple code is just the value */
                         } else {
-                                r.e = (unsigned char) e[*p - s]; /* non-simple--look up in lists */
-                                r.v.n = d[*p++ - s];
+                                r.e = (unsigned char) cp_ext->ext[*p - s]; /* non-simple--look up in lists */
+                                r.v.n = cp_ext->cp[*p++ - s];
                         }
 
                         /* fill code-like entries with r */
@@ -475,8 +477,11 @@ static int huft_build(const unsigned *b, const unsigned n,
         /* return actual size of base table */
         *m = ws[1];
 
-        /* Return 1 if we were given an incomplete table */
-        return y != 0 && g != 1;
+        if (y != 0 && g != 1) /* we were given an incomplete table */
+                /* return "result" ORed with 1 */
+                return (void*)((uintptr_t)result | 1);
+
+        return result;
 }
 
 
@@ -777,14 +782,17 @@ static int inflate_block(STATE_PARAM smallint *e)
                 for (; i < 288; i++) /* make a complete, but wrong code set */
                         ll[i] = 8;
                 bl = 7;
-                huft_build(ll, 288, 257, cplens, cplext, &inflate_codes_tl, &bl);
-                /* huft_build() never return nonzero - we use known data */
+                inflate_codes_tl = huft_build(ll, 288, 257, &lit, &bl);
+                /* ^^^ never returns error here - we use known data */
 
                 /* set up distance table */
                 for (i = 0; i < 30; i++) /* make an incomplete code set */
                         ll[i] = 5;
                 bd = 5;
-                huft_build(ll, 30, 0, cpdist, cpdext, &inflate_codes_td, &bd);
+                inflate_codes_td = huft_build(ll, 30, 0, &dist, &bd);
+                /* ^^^ does return error here! (lsb bit is set) - we gave it incomplete code set */
+                /* clearing error bit: */
+                inflate_codes_td = (void*)((uintptr_t)inflate_codes_td & ~(uintptr_t)1);
 
                 /* set up data for inflate_codes() */
                 inflate_codes_setup(PASS_STATE bl, bd);
@@ -850,9 +858,9 @@ static int inflate_block(STATE_PARAM smallint *e)
 
                 /* build decoding table for trees - single level, 7 bit lookup */
                 bl = 7;
-                i = huft_build(ll, 19, 19, NULL, NULL, &inflate_codes_tl, &bl);
-                if (i != 0) {
-                        abort_unzip(PASS_STATE_ONLY); //return i;       /* incomplete code set */
+                inflate_codes_tl = huft_build(ll, 19, 19, NULL, &bl);
+                if (BAD_HUFT(inflate_codes_tl)) {
+                        abort_unzip(PASS_STATE_ONLY);   /* incomplete code set */
                 }
 
                 /* read in literal and distance code lengths */
@@ -915,14 +923,13 @@ static int inflate_block(STATE_PARAM smallint *e)
 
                 /* build the decoding tables for literal/length and distance codes */
                 bl = lbits;
-
-                i = huft_build(ll, nl, 257, cplens, cplext, &inflate_codes_tl, &bl);
-                if (i != 0) {
+                inflate_codes_tl = huft_build(ll, nl, 257, &lit, &bl);
+                if (BAD_HUFT(inflate_codes_tl)) {
                         abort_unzip(PASS_STATE_ONLY);
                 }
                 bd = dbits;
-                i = huft_build(ll + nl, nd, 0, cpdist, cpdext, &inflate_codes_td, &bd);
-                if (i != 0) {
+                inflate_codes_td = huft_build(ll + nl, nd, 0, &dist, &bd);
+                if (BAD_HUFT(inflate_codes_td)) {
                         abort_unzip(PASS_STATE_ONLY);
                 }
 
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
index f03341384..3dd9bbf49 100644
--- a/archival/libarchive/decompress_unxz.c
+++ b/archival/libarchive/decompress_unxz.c
@@ -96,6 +96,24 @@ unpack_xz_stream(transformer_state_t *xstate)
                          */
                         do {
                                 if (membuf[iobuf.in_pos] != 0) {
+                                        /* There is more data, but is it XZ data?
+                                         * Example: dpkg-deb -f busybox_1.30.1-4_amd64.deb
+                                         * reads control.tar.xz "control" file
+                                         * inside the ar archive, but tar.xz
+                                         * extraction code reaches end of xz data,
+                                         * reached this code and reads the beginning
+                                         * of data.tar.xz's ar header, which isn't xz data,
+                                         * and prints "corrupted data".
+                                         * The correct solution is to not read
+                                         * past nested archive (to simulate EOF).
+                                         * This is a workaround:
+                                         */
+                                        if (membuf[iobuf.in_pos] != 0xfd) {
+                                                /* It's definitely not a xz signature
+                                                 * (which is 0xfd,"7zXZ",0x00).
+                                                 */
+                                                goto end;
+                                        }
                                         xz_dec_reset(state);
                                         goto do_run;
                                 }
@@ -128,7 +146,7 @@ unpack_xz_stream(transformer_state_t *xstate)
                         break;
                 }
         }
-
+ end:
         xz_dec_end(state);
         free(membuf);
 
diff --git a/archival/libarchive/unxz/xz_stream.h b/archival/libarchive/unxz/xz_stream.h
index 66cb5a705..45056e42c 100644
--- a/archival/libarchive/unxz/xz_stream.h
+++ b/archival/libarchive/unxz/xz_stream.h
@@ -25,7 +25,7 @@
 
 #define STREAM_HEADER_SIZE 12
 
-#define HEADER_MAGIC "\3757zXZ"
+#define HEADER_MAGIC "\375""7zXZ"
 #define HEADER_MAGIC_SIZE 6
 
 #define FOOTER_MAGIC "YZ"