Merge branch 'busybox' into merge

2 files changed, 28 insertions, 18 deletions

diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index 78366f26a..1f535b32a 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -235,9 +235,9 @@ static int get_next_block(bunzip_data *bd)
                 /* Get next value */
                 int n = 0;
                 while (get_bits(bd, 1)) {
+                        n++;
                         if (n >= groupCount)
                                 return RETVAL_DATA_ERROR;
-                        n++;
                 }
                 /* Decode MTF to get the next selector */
                 tmp_byte = mtfSymbol[n];
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 69f3ecc66..3a0fc4712 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -180,47 +180,44 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog)
  */
 static transformer_state_t *setup_transformer_on_fd(int fd, int fail_if_not_compressed)
 {
-        union {
-                uint8_t b[4];
-                uint16_t b16[2];
-                uint32_t b32[1];
-        } magic;
         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
          * unpack_XXX_stream wants this header skipped. */
-        xread(fd, magic.b16, sizeof(magic.b16[0]));
+        xstate->signature_skipped = 2;
+        xread(fd, xstate->magic.b16, 2);
         if (ENABLE_FEATURE_SEAMLESS_GZ
-         && magic.b16[0] == GZIP_MAGIC
+         && xstate->magic.b16[0] == GZIP_MAGIC
         ) {
                 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->magic.b16[0] == COMPRESS_MAGIC
         ) {
                 xstate->xformer = unpack_Z_stream;
                 USE_FOR_NOMMU(xstate->xformer_prog = "uncompress";)
                 goto found_magic;
         }
         if (ENABLE_FEATURE_SEAMLESS_BZ2
-         && magic.b16[0] == BZIP2_MAGIC
+         && xstate->magic.b16[0] == BZIP2_MAGIC
         ) {
                 xstate->xformer = unpack_bz2_stream;
                 USE_FOR_NOMMU(xstate->xformer_prog = "bunzip2";)
                 goto found_magic;
         }
         if (ENABLE_FEATURE_SEAMLESS_XZ
-         && magic.b16[0] == XZ_MAGIC1
+         && xstate->magic.b16[0] == XZ_MAGIC1
         ) {
+                uint32_t v32;
                 xstate->signature_skipped = 6;
-                xread(fd, magic.b32, sizeof(magic.b32[0]));
-                if (magic.b32[0] == XZ_MAGIC2) {
+                xread(fd, &xstate->magic.b16[1], 4);
+                move_from_unaligned32(v32, &xstate->magic.b16[1]);
+                if (v32 == XZ_MAGIC2) {
                         xstate->xformer = unpack_xz_stream;
                         USE_FOR_NOMMU(xstate->xformer_prog = "unxz";)
                         goto found_magic;
@@ -365,11 +362,24 @@ void* FAST_FUNC xmalloc_open_zipped_read_close(const char *fname, size_t *maxsz_
                                 *maxsz_p = xstate->mem_output_size;
                 }
         } else {
-                /* File is not compressed */
-//FIXME: avoid seek
-                xlseek(xstate->src_fd, - xstate->signature_skipped, SEEK_CUR);
+                /* File is not compressed.
+                 * We already read first few bytes, account for that.
+                 * Example where it happens:
+                 * "modinfo MODULE.ko" (not compressed)
+                 *   open("MODULE.ko", O_RDONLY|O_LARGEFILE) = 4
+                 *   read(4, "\177E", 2)                     = 2
+                 *   fstat64(4, ...)
+                 *   mmap(...)
+                 *   read(4, "LF\2\1\1\0\0\0\0"...
+                 * ...and we avoided seeking on the fd! :)
+                 */
+                image = xmalloc_read_with_initial_buf(
+                        xstate->src_fd,
+                        maxsz_p,
+                        xmemdup(&xstate->magic, xstate->signature_skipped),
+                        xstate->signature_skipped
+                );
                 xstate->signature_skipped = 0;
-                image = xmalloc_read(xstate->src_fd, maxsz_p);
         }
 
         if (!image)