Merge pull request #230 from crepererum-oss/crepererum/issue228

refactor: harden decompression checks
crepererum-oss · Jul 17, 2024 · e7b13aa · e7b13aa
2 parents d273568 + 929ed46
commit e7b13aa
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/compression.rs b/src/compression.rs
@@ -11,10 +11,13 @@ pub(crate) fn decompress_value(v: &[u8]) -> Result<Vec<u8>> {
             Ok(out) => {
                 return Ok(out);
             }
-            Err(lz4_flex::block::DecompressError::OutputTooSmall { expected, .. })
-                if expected > out_len =>
-            {
-                out_len = expected.max(out_len.saturating_mul(2));
+            Err(lz4_flex::block::DecompressError::OutputTooSmall { expected, actual }) => {
+                assert_eq!(actual, out_len);
+                assert!(
+                    expected > actual,
+                    "failed: expected ({expected}) > actual ({actual})"
+                );
+                out_len = expected.max(actual.saturating_mul(2));
             }
             Err(e) => {
                 return Err(e).context("decompression");