Backport of #61 (Fix some major LZMA2 decompression issues)

gendx · May 2, 2021 · 7c17e97 · 7c17e97
1 parent 9a87fef
commit 7c17e97
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/decode/lzbuffer.rs b/src/decode/lzbuffer.rs
@@ -47,7 +47,7 @@ where
     pub fn reset(&mut self) -> io::Result<()> {
         self.stream.write_all(self.buf.as_slice())?;
         self.buf.clear();
-        // TODO: clear the length ?
+        self.len = 0;
         Ok(())
     }
 }

diff --git a/src/decode/lzma2.rs b/src/decode/lzma2.rs
@@ -68,11 +68,16 @@ where
             reset_state = false;
             reset_props = false;
         }
-        1 | 2 => {
+        1 => {
             reset_dict = false;
             reset_state = true;
             reset_props = false;
         }
+        2 => {
+            reset_dict = false;
+            reset_state = true;
+            reset_props = true;
+        }
         3 => {
             reset_dict = true;
             reset_state = true;
@@ -153,7 +158,7 @@ where
         decoder.reset_state(lc, lp, pb);
     }
 
-    decoder.set_unpacked_size(Some(unpacked_size));
+    decoder.set_unpacked_size(Some(unpacked_size + decoder.output.len() as u64));
 
     let mut taken = input.take(packed_size);
     let mut rangecoder = rangecoder::RangeDecoder::new(&mut taken).or_else(|e| {