Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive/decompress_uncompress.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/libarchive/decompress_uncompress.c (modified) (13 diffs)

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

@@ -26 +26 @@
 
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 
 
@@ -74 +74 @@
 
 IF_DESKTOP(long long) int FAST_FUNC
-unpack_Z_stream(int fd_in, int fd_out)
+unpack_Z_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
 {
     IF_DESKTOP(long long total_written = 0;)
     IF_DESKTOP(long long) int retval = -1;
     unsigned char *stackp;
-    long code;
     int finchar;
     long oldcode;
@@ -104 +103 @@
     int block_mode; /* = BLOCK_MODE; */
 
+    if (check_signature16(aux, src_fd, COMPRESS_MAGIC))
+        return -1;
+
     inbuf = xzalloc(IBUFSIZ + 64);
     outbuf = xzalloc(OBUFSIZ + 2048);
-    htab = xzalloc(HSIZE);  /* wsn't zeroed out before, maybe can xmalloc? */
+    htab = xzalloc(HSIZE);  /* wasn't zeroed out before, maybe can xmalloc? */
     codetab = xzalloc(HSIZE * sizeof(codetab[0]));
 
@@ -113 +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(fd_in, inbuf, 1) != 1) {
+    if (full_read(src_fd, inbuf, 1) != 1) {
         bb_error_msg("short read");
         goto err;
@@ -141 +143 @@
     /*clear_tab_prefixof(); - done by xzalloc */
 
-    for (code = 255; code >= 0; --code) {
-        tab_suffixof(code) = (unsigned char) code;
+    {
+        int i;
+        for (i = 255; i >= 0; --i)
+            tab_suffixof(i) = (unsigned char) i;
     }
 
@@ -163 +167 @@
 
         if (insize < (int) (IBUFSIZ + 64) - IBUFSIZ) {
-            rsize = safe_read(fd_in, inbuf + insize, IBUFSIZ);
-//error check??
+            rsize = safe_read(src_fd, inbuf + insize, IBUFSIZ);
+            if (rsize < 0)
+                bb_error_msg_and_die(bb_msg_read_error);
             insize += rsize;
         }
@@ -172 +177 @@
 
         while (inbits > posbits) {
+            long code;
+
             if (free_ent > maxcode) {
                 posbits =
@@ -188 +195 @@
             {
                 unsigned char *p = &inbuf[posbits >> 3];
-
-                code = ((((long) (p[0])) | ((long) (p[1]) << 8) |
-                         ((long) (p[2]) << 16)) >> (posbits & 0x7)) & bitmask;
+                code = ((p[0]
+                    | ((long) (p[1]) << 8)
+                    | ((long) (p[2]) << 16)) >> (posbits & 0x7)) & bitmask;
             }
             posbits += n_bits;
 
-
             if (oldcode == -1) {
+                if (code >= 256)
+                    bb_error_msg_and_die("corrupted data"); /* %ld", code); */
                 oldcode = code;
                 finchar = (int) oldcode;
@@ -221 +229 @@
             if (code >= free_ent) {
                 if (code > free_ent) {
+/*
                     unsigned char *p;
 
                     posbits -= n_bits;
                     p = &inbuf[posbits >> 3];
-
                     bb_error_msg
                         ("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)",
-                         insize, posbits, p[-1], p[0], p[1], p[2], p[3],
-                         (posbits & 07));
+                        insize, posbits, p[-1], p[0], p[1], p[2], p[3],
+                        (posbits & 07));
+*/
                     bb_error_msg("corrupted data");
                     goto err;
@@ -239 +248 @@
 
             /* Generate output characters in reverse order */
-            while ((long) code >= (long) 256) {
+            while (code >= 256) {
+                if (stackp <= &htabof(0))
+                    bb_error_msg_and_die("corrupted data");
                 *--stackp = tab_suffixof(code);
                 code = tab_prefixof(code);
@@ -264 +275 @@
 
                         if (outpos >= OBUFSIZ) {
-                            full_write(fd_out, outbuf, outpos);
-//error check??
+                            xwrite(dst_fd, outbuf, outpos);
                             IF_DESKTOP(total_written += outpos;)
                             outpos = 0;
@@ -279 +289 @@
 
             /* Generate the new entry. */
-            code = free_ent;
-            if (code < maxmaxcode) {
-                tab_prefixof(code) = (unsigned short) oldcode;
-                tab_suffixof(code) = (unsigned char) finchar;
-                free_ent = code + 1;
+            if (free_ent < maxmaxcode) {
+                tab_prefixof(free_ent) = (unsigned short) oldcode;
+                tab_suffixof(free_ent) = (unsigned char) finchar;
+                free_ent++;
             }
 
@@ -293 +302 @@
 
     if (outpos > 0) {
-        full_write(fd_out, outbuf, outpos);
-//error check??
+        xwrite(dst_fd, outbuf, outpos);
         IF_DESKTOP(total_written += outpos;)
     }