[Python-checkins] r84410 - in python/branches/release31-maint: Lib/test/test_memoryview.py Misc/NEWS Objects/memoryobject.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Wed Sep  1 23:16:10 2010
New Revision: 84410

Log:
Merged revisions 84408-84409 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84408 | antoine.pitrou | 2010-09-01 23:14:16 +0200 (mer., 01 sept. 2010) | 4 lines
  
  Issue #9737: Fix a crash when trying to delete a slice or an item from
  a memoryview object. 
........
  r84409 | antoine.pitrou | 2010-09-01 23:14:46 +0200 (mer., 01 sept. 2010) | 3 lines
  
  Fix a compilation warning
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_memoryview.py
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Objects/memoryobject.c

Modified: python/branches/release31-maint/Lib/test/test_memoryview.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_memoryview.py	(original)
+++ python/branches/release31-maint/Lib/test/test_memoryview.py	Wed Sep  1 23:16:10 2010
@@ -111,6 +111,15 @@
         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))

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Wed Sep  1 23:16:10 2010
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #9737: Fix a crash when trying to delete a slice or an item from
+  a memoryview object.
+
 - Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API
   properly.  Patch by Stefan Behnel.
 

Modified: python/branches/release31-maint/Objects/memoryobject.c
==============================================================================
--- python/branches/release31-maint/Objects/memoryobject.c	(original)
+++ python/branches/release31-maint/Objects/memoryobject.c	Wed Sep  1 23:16:10 2010
@@ -179,7 +179,7 @@
     int k;
     Py_ssize_t elements;
     char *ptr;
-    void (*func)(int, Py_ssize_t *, Py_ssize_t *);
+    void (*func)(int, Py_ssize_t *, const Py_ssize_t *);
 
     if (view->ndim > PY_SSIZE_T_MAX / sizeof(Py_ssize_t)) {
         PyErr_NoMemory();
@@ -631,6 +631,11 @@
             "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;