Merge pull request #14 from anatawa12/fix-err-with-some-archive

Fix err with some archive

CHANGELOG.md

@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
 ### Removed
 
 ### Fixed
+- Overflow substract with some archive `#14`
 
 ### Security
 

src/output_window.rs

@@ -109,7 +109,7 @@ impl OutputWindow {
             }
         } else {
             // only one copy is needed if there is no wrap around.
-            copied = input.copy_to(&mut self.window[self.end..][..tail_len]);
+            copied = input.copy_to(&mut self.window[self.end..][..length]);
         }
 
         self.end = (self.end + copied) & WINDOW_MASK;

test-assets/README.md

@@ -2,5 +2,10 @@ Some assets in directory is copied from [dotnet-assets].
 
 - deflate64.zip is originally at https://github.com/dotnet/runtime-assets/blob/95277f38e68b66f1b48600d90d456c32c9ae0fa2/src/System.IO.Compression.TestData/ZipTestData/compat/deflate64.zip
 - folder is originally at https://github.com/dotnet/runtime-assets/tree/95277f38e68b66f1b48600d90d456c32c9ae0fa2/src/System.IO.Compression.TestData/ZipTestData/refzipfolders/normal
+- `issue-13/unitwf-1.5.0.minimized.zip` is originally at https://github.com/whiteflare/Unlit_WF_ShaderSuite/releases/download/UnlitWF_Shader_20231011/jp.whiteflare.unlitwf-1.5.0.zip
+  and removed many unnecessary zip records for testing.
+- `test-assets/issue-13/logo.png` is originally at https://github.com/whiteflare/Unlit_WF_ShaderSuite/blob/505c10c19b2f632aac2596109ce6ed6f5ad79996/Logo/UnlitWF%E3%83%AD%E3%82%B4_1024.png
+  Please refer https://github.com/whiteflare/Unlit_WF_ShaderSuite/blob/505c10c19b2f632aac2596109ce6ed6f5ad79996/LICENSE
+  for license information of UnlitWF
 
 [dotnet-assets]: https://github.com/dotnet/runtime-assets

tests/issue-13.rs

@@ -0,0 +1,24 @@
+use deflate64::InflaterManaged;
+
+static ZIP_FILE_DATA: &[u8] = include_bytes!("../test-assets/issue-13/unitwf-1.5.0.minimized.zip");
+static BINARY_DATA: &[u8] = include_bytes!("../test-assets/issue-13/logo.png");
+
+fn deflate64_data() -> &'static [u8] {
+    &ZIP_FILE_DATA[1182..][..34919]
+}
+
+#[test]
+fn issue_13() {
+    let compressed_data = deflate64_data();
+
+    let mut uncompressed_data = vec![0u8; BINARY_DATA.len()];
+
+    let mut inflater = Box::new(InflaterManaged::new());
+    let output = inflater.inflate(compressed_data, &mut uncompressed_data);
+
+    assert_eq!(output.bytes_consumed, compressed_data.len());
+    assert_eq!(output.bytes_written, uncompressed_data.len());
+    assert!(!output.data_error, "unexpected error");
+
+    assert_eq!(uncompressed_data.as_slice(), BINARY_DATA);
+}