mirror of https://github.com/python/cpython
Issue #9737: Fix a crash when trying to delete a slice or an item from
a memoryview object.
This commit is contained in:
parent
6cb5ad035b
commit
e0793ba992
|
@ -111,6 +111,15 @@ class AbstractMemoryTests:
|
||||||
m = None
|
m = None
|
||||||
self.assertEquals(sys.getrefcount(b), oldrefcount)
|
self.assertEquals(sys.getrefcount(b), oldrefcount)
|
||||||
|
|
||||||
|
def test_delitem(self):
|
||||||
|
for tp in self._types:
|
||||||
|
b = tp(self._source)
|
||||||
|
m = self._view(b)
|
||||||
|
with self.assertRaises(TypeError):
|
||||||
|
del m[1]
|
||||||
|
with self.assertRaises(TypeError):
|
||||||
|
del m[1:4]
|
||||||
|
|
||||||
def test_tobytes(self):
|
def test_tobytes(self):
|
||||||
for tp in self._types:
|
for tp in self._types:
|
||||||
m = self._view(tp(self._source))
|
m = self._view(tp(self._source))
|
||||||
|
|
|
@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 2?
|
||||||
Core and Builtins
|
Core and Builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- Issue #9737: Fix a crash when trying to delete a slice or an item from
|
||||||
|
a memoryview object.
|
||||||
|
|
||||||
- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding()
|
- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding()
|
||||||
are now removed, since their effect was inexistent in 3.x (the default
|
are now removed, since their effect was inexistent in 3.x (the default
|
||||||
encoding is hardcoded to utf-8 and cannot be changed).
|
encoding is hardcoded to utf-8 and cannot be changed).
|
||||||
|
|
|
@ -631,6 +631,11 @@ memory_ass_sub(PyMemoryViewObject *self, PyObject *key, PyObject *value)
|
||||||
"cannot modify read-only memory");
|
"cannot modify read-only memory");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
if (value == NULL) {
|
||||||
|
PyErr_SetString(PyExc_TypeError,
|
||||||
|
"cannot delete memory");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
if (view->ndim != 1) {
|
if (view->ndim != 1) {
|
||||||
PyErr_SetNone(PyExc_NotImplementedError);
|
PyErr_SetNone(PyExc_NotImplementedError);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in New Issue