changeset:   105245:821da4891051
parent:      105244:180f046b597e
parent:      105242:1253ef20c947
user:        Martin Panter <vadmium+py@gmail.com>
date:        Sun Nov 20 22:17:44 2016 +0000
files:       Misc/NEWS Modules/_ctypes/_ctypes.c
description:
Issue #25659: Merge ctypes fix from 3.6


diff -r 180f046b597e -r 821da4891051 Lib/ctypes/test/test_frombuffer.py
--- a/Lib/ctypes/test/test_frombuffer.py	Sun Nov 20 22:16:46 2016 +0000
+++ b/Lib/ctypes/test/test_frombuffer.py	Sun Nov 20 22:17:44 2016 +0000
@@ -120,5 +120,13 @@
         with self.assertRaises(ValueError):
             (c_int * 1).from_buffer_copy(a, 16 * sizeof(c_int))
 
+    def test_abstract(self):
+        self.assertRaises(TypeError, Array.from_buffer, bytearray(10))
+        self.assertRaises(TypeError, Structure.from_buffer, bytearray(10))
+        self.assertRaises(TypeError, Union.from_buffer, bytearray(10))
+        self.assertRaises(TypeError, Array.from_buffer_copy, b"123")
+        self.assertRaises(TypeError, Structure.from_buffer_copy, b"123")
+        self.assertRaises(TypeError, Union.from_buffer_copy, b"123")
+
 if __name__ == '__main__':
     unittest.main()
diff -r 180f046b597e -r 821da4891051 Misc/NEWS
--- a/Misc/NEWS	Sun Nov 20 22:16:46 2016 +0000
+++ b/Misc/NEWS	Sun Nov 20 22:17:44 2016 +0000
@@ -131,6 +131,9 @@
 Library
 -------
 
+- Issue #25659: In ctypes, prevent a crash calling the from_buffer() and
+  from_buffer_copy() methods on abstract classes like Array.
+
 - Issue #28548: In the "http.server" module, parse the protocol version if
   possible, to avoid using HTTP 0.9 in some error responses.
 
diff -r 180f046b597e -r 821da4891051 Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c	Sun Nov 20 22:16:46 2016 +0000
+++ b/Modules/_ctypes/_ctypes.c	Sun Nov 20 22:17:44 2016 +0000
@@ -463,7 +463,10 @@
     Py_ssize_t offset = 0;
 
     StgDictObject *dict = PyType_stgdict(type);
-    assert (dict);
+    if (!dict) {
+        PyErr_SetString(PyExc_TypeError, "abstract class");
+        return NULL;
+    }
 
     if (!PyArg_ParseTuple(args, "O|n:from_buffer", &obj, &offset))
         return NULL;
@@ -531,9 +534,12 @@
     Py_ssize_t offset = 0;
     PyObject *result;
     StgDictObject *dict = PyType_stgdict(type);
-    assert (dict);
-
-    if (!PyArg_ParseTuple(args, "y*|n:from_buffer", &buffer, &offset))
+    if (!dict) {
+        PyErr_SetString(PyExc_TypeError, "abstract class");
+        return NULL;
+    }
+
+    if (!PyArg_ParseTuple(args, "y*|n:from_buffer_copy", &buffer, &offset))
         return NULL;
 
     if (offset < 0) {