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

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz_dec_lzma2.c

@@ -408 +408 @@
         b->out_pos += copy_size;
         b->in_pos += copy_size;
-
     }
 }
@@ -973 +972 @@
             tmp = b->in[b->in_pos++];
 
+            if (tmp == 0x00)
+                return XZ_STREAM_END;
+
             if (tmp >= 0xE0 || tmp == 0x01) {
                 s->lzma2.need_props = true;
@@ -994 +996 @@
                     s->lzma2.next_sequence
                             = SEQ_PROPERTIES;
-
                 } else if (s->lzma2.need_props) {
                     return XZ_DATA_ERROR;
-
                 } else {
                     s->lzma2.next_sequence
@@ -1005 +1005 @@
                 }
             } else {
-                if (tmp == 0x00)
-                    return XZ_STREAM_END;
-
                 if (tmp > 0x02)
                     return XZ_DATA_ERROR;
@@ -1082 +1079 @@
                 rc_reset(&s->rc);
                 s->lzma2.sequence = SEQ_CONTROL;
-
             } else if (b->out_pos == b->out_size
                     || (b->in_pos == b->in_size