summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-01 21:14:16 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-01 21:14:16 (GMT)
commite0793ba99293ac9df5e7e27d3f78cfc27113b359 (patch)
tree105cd42e802738644ef74b2963f25a2e2ec2d72b
parent6cb5ad035b0eac63fc434c8b9625d28e2f336433 (diff)
downloadcpython-e0793ba99293ac9df5e7e27d3f78cfc27113b359.zip
cpython-e0793ba99293ac9df5e7e27d3f78cfc27113b359.tar.gz
cpython-e0793ba99293ac9df5e7e27d3f78cfc27113b359.tar.bz2
Issue #9737: Fix a crash when trying to delete a slice or an item from
a memoryview object.
-rw-r--r--Lib/test/test_memoryview.py9
-rw-r--r--Misc/NEWS3
-rw-r--r--Objects/memoryobject.c5
3 files changed, 17 insertions, 0 deletions
diff --git a/Lib/test/test_memoryview.py b/Lib/test/test_memoryview.py
index 6ca23fc..8e56df9 100644
--- a/Lib/test/test_memoryview.py
+++ b/Lib/test/test_memoryview.py
@@ -111,6 +111,15 @@ class AbstractMemoryTests:
m = None
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):
for tp in self._types:
m = self._view(tp(self._source))
diff --git a/Misc/NEWS b/Misc/NEWS
index 2a959a4..92d858a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 2?
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()
are now removed, since their effect was inexistent in 3.x (the default
encoding is hardcoded to utf-8 and cannot be changed).
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index 9a62dd8..3f20392 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -631,6 +631,11 @@ memory_ass_sub(PyMemoryViewObject *self, PyObject *key, PyObject *value)
"cannot modify read-only memory");
return -1;
}
+ if (value == NULL) {
+ PyErr_SetString(PyExc_TypeError,
+ "cannot delete memory");
+ return -1;
+ }
if (view->ndim != 1) {
PyErr_SetNone(PyExc_NotImplementedError);
return -1;