#3946 fix PyObject_CheckBuffer on a memoryview object

benjaminp · benjaminp · commit 60320cb3e4fa · 2008-09-26T21:49:22.000Z
reviewed by Antoine
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
@@ -242,6 +242,7 @@ def test_compile(self):
         compile(source='pass', filename='?', mode='exec')
         compile(dont_inherit=0, filename='tmp', source='0', mode='eval')
         compile('pass', '?', dont_inherit=1, mode='exec')
+        compile(memoryview(b"text"), "name", "exec")
         self.assertRaises(TypeError, compile)
         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'single', 0xff)
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.0 release candidate 2
 Core and Builtins
 -----------------
 
+- Issue #3946: PyObject_CheckReadBuffer crashed on a memoryview object.
+
 - Issue #1688: On Windows, the input() prompt was not correctly displayed if it
   contains non-ascii characters.
 
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -268,16 +268,16 @@ int
 PyObject_CheckReadBuffer(PyObject *obj)
 {
 	PyBufferProcs *pb = obj->ob_type->tp_as_buffer;
+	Py_buffer view;
 
 	if (pb == NULL ||
 	    pb->bf_getbuffer == NULL)
 		return 0;
-	if ((*pb->bf_getbuffer)(obj, NULL, PyBUF_SIMPLE) == -1) {
+	if ((*pb->bf_getbuffer)(obj, &view, PyBUF_SIMPLE) == -1) {
 		PyErr_Clear();
 		return 0;
 	}
-	if (*pb->bf_releasebuffer != NULL)
-		(*pb->bf_releasebuffer)(obj, NULL);
+	PyBuffer_Release(&view);
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -268,16 +268,16 @@ int`
`268`	`268`	`PyObject_CheckReadBuffer(PyObject *obj)`
`269`	`269`	`{`
`270`	`270`	`PyBufferProcs *pb = obj->ob_type->tp_as_buffer;`
	`271`	`+ Py_buffer view;`
`271`	`272`
`272`	`273`	`if (pb == NULL \|\|`
`273`	`274`	`pb->bf_getbuffer == NULL)`
`274`	`275`	`return 0;`
`275`		`- if ((*pb->bf_getbuffer)(obj, NULL, PyBUF_SIMPLE) == -1) {`
	`276`	`+ if ((*pb->bf_getbuffer)(obj, &view, PyBUF_SIMPLE) == -1) {`
`276`	`277`	`PyErr_Clear();`
`277`	`278`	`return 0;`
`278`	`279`	`}`
`279`		`- if (*pb->bf_releasebuffer != NULL)`
`280`		`- (*pb->bf_releasebuffer)(obj, NULL);`
	`280`	`+ PyBuffer_Release(&view);`
`281`	`281`	`return 1;`
`282`	`282`	`}`
`283`	`283`