Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_dec_bcj.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/unxz/xz_dec_bcj.c (modified) (3 diffs)

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;