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

qkaiser · web-flow · commit 5b0f16fc67ee · 2024-06-24T06:57:10.000+02:00
Fix frame_content_size retrieval logic
diff --git a/tests/integration/compression/zstd/__input__/large_fcs.zstd b/tests/integration/compression/zstd/__input__/large_fcs.zstd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c6fc92dda937dd453b83c60f0d439c87a156d09888ede3d47201e13c26245e8
+size 26
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
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cc43248c8a1245d2dc0d1e6a2fb9935d3506689bd8abd037f040af136dc0269
+size 65792
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]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:6c6fc92dda937dd453b83c60f0d439c87a156d09888ede3d47201e13c26245e8`
	`3`	`+size 26`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:8cc43248c8a1245d2dc0d1e6a2fb9935d3506689bd8abd037f040af136dc0269`
	`3`	`+size 65792`