fix: use-after-free in get_data_from_buffer (#677)

This commit is contained in:
Thomas Kowalski 2026-06-02 17:21:59 +02:00 committed by GitHub
parent 975a2a4c84
commit e861f75374
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions

View file

@ -129,10 +129,9 @@ cdef inline int get_data_from_buffer(object obj,
PyBuffer_Release(view)
# create a contiguous copy and get buffer
contiguous = PyMemoryView_GetContiguous(obj, PyBUF_READ, b'C')
PyObject_GetBuffer(contiguous, view, PyBUF_SIMPLE)
# view must hold the only reference to contiguous,
# so memory is freed when view is released
Py_DECREF(contiguous)
if PyObject_GetBuffer(contiguous, view, PyBUF_SIMPLE) == -1:
raise
buffer_len[0] = view.len
buf[0] = <char*> view.buf
return 1

View file

@ -328,7 +328,7 @@ class Unpacker:
self._buf_checkpoint = 0
# Use extend here: INPLACE_ADD += doesn't reliably typecast memoryview in jython
self._buffer.extend(view)
self._buffer.extend(view if view.contiguous else view.tobytes())
view.release()
def _consume(self):

View file

@ -97,3 +97,15 @@ def test_multidim_memoryview():
data = view.cast(view.format, (3, 2))
packed = packb(data)
assert packed == b"\xc4\x06\x00\x00\x00\x00\x00\x00"
def test_unpack_noncontiguous_memoryview():
# Use a multi-byte value so the padded stride-2 view is non-contiguous.
packed = packb(2**32)
padded = bytearray()
for byte in packed:
padded.append(byte)
padded.append(0)
noncont = memoryview(bytes(padded))[::2]
assert not noncont.c_contiguous
assert unpackb(noncont) == 2**32