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

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/decompress_bunzip2.c (modified) (9 diffs)

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;