Skip to content

Fix Zstd decompression negative size issue on 32-bit platforms (Fixes #781) #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 19, 2025
Merged

Fix Zstd decompression negative size issue on 32-bit platforms (Fixes #781) #782

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41150f2
Update zstd.pyx with new content
mkitti Aug 18, 2025
10a01d7
Merge branch 'main' into zstd-frame-content-size-ull
mkitti Aug 18, 2025
b0fe556
Apply suggestion from @mkitti
mkitti Aug 18, 2025
1349304
Fix LLM issues ..
Aug 18, 2025
786d31f
Add pass, comment for dest_size
Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions numcodecs/zstd.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def compress(source, int level=DEFAULT_CLEVEL, bint checksum=False):
level = MAX_CLEVEL

# obtain source memoryview
source_mv = ensure_continguous_memoryview(source)
source_mv = ensure_contiguous_memoryview(source)
source_pb = PyMemoryView_GET_BUFFER(source_mv)

# setup source buffer
Expand Down Expand Up @@ -202,30 +202,31 @@ def decompress(source, dest=None):
Py_buffer* dest_pb
char* dest_ptr
size_t source_size, dest_size, decompressed_size
size_t nbytes, cbytes, blocksize
size_t dest_nbytes
unsigned long long content_size

# obtain source memoryview
source_mv = ensure_continguous_memoryview(source)
source_mv = ensure_contiguous_memoryview(source)
source_pb = PyMemoryView_GET_BUFFER(source_mv)

# get source pointer
source_ptr = <const char*>source_pb.buf
source_size = source_pb.len

try:

# determine uncompressed size
dest_size = ZSTD_getFrameContentSize(source_ptr, source_size)
if dest_size == 0 or dest_size == ZSTD_CONTENTSIZE_ERROR:
# determine uncompressed size using unsigned long long for full range
content_size = ZSTD_getFrameContentSize(source_ptr, source_size)
if content_size == ZSTD_CONTENTSIZE_UNKNOWN and dest is None:
return stream_decompress(source_pb)
elif content_size == ZSTD_CONTENTSIZE_ERROR or content_size == 0:
raise RuntimeError('Zstd decompression error: invalid input data')
elif content_size > (<unsigned long long>SIZE_MAX):
raise RuntimeError('Zstd decompression error: content size too large for platform')

if dest_size == ZSTD_CONTENTSIZE_UNKNOWN and dest is None:
return stream_decompress(source_pb)
dest_size = <size_t>content_size

# setup destination buffer
if dest is None:
# allocate memory
dest_1d = dest = PyBytes_FromStringAndSize(NULL, dest_size)
else:
dest_1d = ensure_contiguous_ndarray(dest)
Expand All @@ -236,9 +237,6 @@ def decompress(source, dest=None):
dest_ptr = <char*>dest_pb.buf
dest_nbytes = dest_pb.len

if dest_size == ZSTD_CONTENTSIZE_UNKNOWN:
dest_size = dest_nbytes

# validate output buffer
if dest_nbytes < dest_size:
raise ValueError('destination buffer too small; expected at least %s, '
Expand Down Expand Up @@ -388,7 +386,7 @@ class Zstd(Codec):
return decompress(buf, out)

def __repr__(self):
r = '%s(level=%r)' % \
r = '%s(level=%r)' %
(type(self).__name__,
self.level)
return r
Expand All @@ -406,4 +404,4 @@ class Zstd(Codec):
@classmethod
def max_level(cls):
"""Returns the maximum compression level of the underlying zstd library."""
return ZSTD_maxCLevel()
return ZSTD_maxCLevel()
Loading