Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 9 additions & 11 deletions src/isal/isal_zlibmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1626,17 +1626,15 @@ GzipReader_read_from_file(GzipReader *self)
uint8_t *buffer_end = self->buffer_end;
size_t remaining = buffer_end - current_pos;
if (remaining == self->buffer_size) {
/* Buffer is full but a new read request was issued. This will be due
to the header being bigger than the header. Enlarge the buffer
to accommodate the hzip header. */
size_t new_buffer_size = self->buffer_size * 2;
uint8_t *tmp_buffer = PyMem_Realloc(self->input_buffer, new_buffer_size);
if (tmp_buffer == NULL) {
PyErr_NoMemory();
return -1;
}
self->input_buffer = tmp_buffer;
self->buffer_size = new_buffer_size;
/* Buffer is full but a new read request was issued. This will be due
to the header being bigger than the buffer. To prevent adverserial
inputs with infinite header sizes an error is thrown here. */
PyErr_Format(
PyExc_OverflowError,
"Gzip header exceeds input buffer size of %lu",
self->buffer_size
);
return -1;
} else if (remaining > 0) {
memmove(self->input_buffer, current_pos, remaining);
}
Expand Down
26 changes: 25 additions & 1 deletion tests/test_igzip.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ def test_very_long_header_in_data():
def test_very_long_header_in_file():
# header with a very long filename.
header = (b"\x1f\x8b\x08\x08\x00\x00\x00\x00\x00\xff" +
igzip.READ_BUFFER_SIZE * 2 * b"A" +
(igzip.READ_BUFFER_SIZE - 11) * b"A" +
b"\x00")
compressed = header + isal_zlib.compress(b"", 3, -15) + 8 * b"\00"
f = io.BytesIO(compressed)
Expand Down Expand Up @@ -473,3 +473,27 @@ def test_bgzip():
with igzip.open(gzip_file, "rb") as gz:
gz_data = gz.read()
assert bgz_data == gz_data


def test_adverserial_header():
magic = b"\x1f\x8b"
method = 8
mtime = 0
flags = FCOMMENT
_os = 255
xfl = 0
header = struct.pack("<2sBBIBB", magic, method, flags, mtime, xfl, _os)
comment = b"A" * 10 * 1024 * 1024 + b"\00"
compressed = isal_zlib.compress(b"", wbits=-15)
crc = isal_zlib.crc32(b"")
length = 0
trailer = struct.pack("<II", crc, length)
adverserial = header + comment + compressed + trailer
with tempfile.NamedTemporaryFile("wb", delete=False) as tmpfile:
tmpfile.write(adverserial)
try:
with pytest.raises(OverflowError):
with igzip.open(tmpfile.name, "rb") as gzip_file:
gzip_file.read()
finally:
os.remove(tmpfile.name)
Loading