Skip to content

Reject empty inputs before multi-frame decompression #348

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

Open
mikamikasuki wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reject empty inputs before multi-frame decompression #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions c-ext/decompressor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,6 +1684,11 @@ Decompressor_multi_decompress_to_buffer(ZstdDecompressor *self, PyObject *args,
goto finally;
}

if (0 == frameCount) {
PyErr_SetString(PyExc_ValueError, "no source elements found");
goto finally;
}

/* We now have an array with info about our inputs and outputs. Feed it into
our generic decompression function. */
frameSources.frames = framePointers;
Expand Down
15 changes: 15 additions & 0 deletions tests/test_decompressor_multi_decompress_to_buffer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,21 @@ def test_invalid_inputs(self):
):
dctx.multi_decompress_to_buffer([b"foobarbaz"])

def test_empty_input(self):
dctx = zstd.ZstdDecompressor()
frames = [[], zstd.BufferWithSegments(b"", b"")]

for frame in frames:
for threads in (0, 2, -1):
for kwargs in ({}, {"decompressed_sizes": b""}):
with self.subTest(
frames=frame, threads=threads, kwargs=kwargs
):
with self.assertRaises(ValueError):
dctx.multi_decompress_to_buffer(
frame, threads=threads, **kwargs
)

def test_list_input(self):
cctx = zstd.ZstdCompressor()

Expand Down