Skip to content
Open
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
12 changes: 10 additions & 2 deletions Lib/test/test_memoryview.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,8 @@ def __buffer__(self, flags):
data.clear()
return memoryview(data)

view == Other()
with self.assertRaisesRegex(ValueError, "released"):
view == Other()
with self.assertRaisesRegex(ValueError, "released"):
view.tobytes()
data.clear()
Expand Down Expand Up @@ -769,7 +770,8 @@ def __buffer__(self, flags):
_testcapi.clear_memoryview(view)
return memoryview(data)

self.assertTrue(view == Other())
with self.assertRaisesRegex(ValueError, "released"):
view == Other()
with self.assertRaisesRegex(ValueError, "released"):
view.tobytes()
data.clear()
Expand Down Expand Up @@ -996,6 +998,12 @@ def __bool__(self):
m[0] = MyBool()
self.assertEqual(ba[:8], b'\0'*8)

ba = None
m = memoryview(bytearray(b'\xff'*size)).cast('c')
with self.assertRaisesRegex(ValueError, "operation forbidden"):
m[MyIndex()] = b'x'
self.assertEqual(ba[:8], b'\0'*8)

def test_buffer_reference_loop(self):
m = memoryview(b'abc').__buffer__(0)
o = MyObject()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix use of a released :class:`memoryview` in comparison and in item
assignment with format ``'c'`` when user code releases the view.
8 changes: 8 additions & 0 deletions Objects/memoryobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -2268,6 +2268,7 @@ pack_single(PyMemoryViewObject *self, char *ptr, PyObject *item, const char *fmt
return type_error_int(fmt);
if (PyBytes_GET_SIZE(item) != 1)
return value_error_int(fmt);
CHECK_RELEASED_INT_AGAIN(self);
*ptr = PyBytes_AS_STRING(item)[0];
break;

Expand Down Expand Up @@ -3551,6 +3552,13 @@ memory_richcompare_pinned(PyObject *v, PyObject *w, int op)
goto result; /* Py_NotImplemented */
}
ww = &wbuf;
/* w.__buffer__() may have released v. */
if (BASE_INACCESSIBLE(v)) {
Comment thread
alonfaraj marked this conversation as resolved.
Resolved
PyErr_SetString(PyExc_ValueError,
"operation forbidden on released memoryview object");
equal = MV_COMPARE_EX;
goto result;
}
}

if (!equiv_shape(vv, ww)) {
Expand Down
Loading