Merge pull request #882 from ivanovanton/bugfix/zstd-frame-content-size

Fix frame_content_size retrieval logic
onekey-sec · Jun 24, 2024 · 5b0f16f · 5b0f16f
2 parents f2a63d2 + b76d1b4
commit 5b0f16f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/tests/integration/compression/zstd/__input__/large_fcs.zstd b/tests/integration/compression/zstd/__input__/large_fcs.zstd
diff --git a/tests/integration/compression/zstd/__output__/large_fcs.zstd_extract/zstd.uncompressed b/tests/integration/compression/zstd/__output__/large_fcs.zstd_extract/zstd.uncompressed
diff --git a/unblob/handlers/compression/zstd.py b/unblob/handlers/compression/zstd.py
@@ -29,7 +29,7 @@ class ZSTDHandler(Handler):
     def get_frame_header_size(self, frame_header_descriptor: int) -> int:
         single_segment = (frame_header_descriptor >> 5 & 1) & 0b1
         dictionary_id = frame_header_descriptor >> 0 & 0b11
-        frame_content_size = (frame_header_descriptor >> 6) & 0b1
+        frame_content_size = (frame_header_descriptor >> 6) & 0b11
         return (
             int(not single_segment)
             + DICT_ID_FIELDSIZE_MAP[dictionary_id]