Skip to content

Commit 12cd7c8

Browse files
gh-158923: Fix use-after-free in xibufferview_getbuf()
xibufferview_getbuf() didn't incref view->obj. The wrapper is exposed as mv.obj, so something like bytes(mv.obj) released a reference it never took, and the wrapper could be freed while the shared memoryview was still using it.
1 parent b22a8c9 commit 12cd7c8

3 files changed

Lines changed: 20 additions & 4 deletions

File tree

‎Lib/test/test_interpreters/test_api.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,21 @@ def test_running(self):
895895
interp.prepare_main({'spam': False})
896896
interp.exec('assert spam is True')
897897

898+
def test_memoryview_obj_buffer(self):
899+
# gh-158923: Exporting a buffer from the object behind a shared
900+
# memoryview must not drop a reference to it.
901+
interp = interpreters.create()
902+
interp.prepare_main(mv=memoryview(bytearray(b'spam')))
903+
interp.exec(dedent("""
904+
obj = mv.obj
905+
for _ in range(10):
906+
assert bytes(obj) == b'spam'
907+
with memoryview(obj) as m:
908+
assert m.tobytes() == b'spam'
909+
del obj
910+
mv.release()
911+
"""))
912+
898913
@requires_test_modules
899914
def test_created_with_capi(self):
900915
with self.interpreter_obj_from_capi() as (interp, interpid):
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix a crash when exporting a buffer from the object behind a
2+
:class:`memoryview` shared with another interpreter via
3+
:mod:`concurrent.interpreters`. Patch by Christian Aurich Zanettini Martins.

‎Modules/_interpretersmodule.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,10 @@ xibufferview_dealloc(PyObject *op)
199199
static int
200200
xibufferview_getbuf(PyObject *op, Py_buffer *view, int flags)
201201
{
202-
/* Only PyMemoryView_FromObject() should ever call this,
203-
via _memoryview_from_xid() below. */
204202
xibufferview *self = (xibufferview *)op;
205203
*view = *self->view;
206204
/* This is the workaround mentioned earlier. */
207-
view->obj = op;
205+
view->obj = Py_NewRef(op);
208206
// XXX Should we leave it alone?
209207
view->internal = NULL;
210208
return 0;
@@ -254,8 +252,8 @@ _memoryview_from_xid(_PyXIData_t *data)
254252
return NULL;
255253
}
256254
PyObject *res = PyMemoryView_FromObject(obj);
255+
Py_DECREF(obj);
257256
if (res == NULL) {
258-
Py_DECREF(obj);
259257
return NULL;
260258
}
261259
view->used = 1;

0 commit comments

Comments
 (0)