Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Lib/test/test_ctypes/test_pointers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import gc
import sys
import unittest
import os
from ctypes import (CDLL, CFUNCTYPE, Structure,
POINTER, pointer, _Pointer,
byref, sizeof,
Expand Down Expand Up @@ -472,6 +473,23 @@ class C(Structure):
ptr.set_type(c_int)
self.assertIs(ptr._type_, c_int)

class TestPointerStringProto(unittest.TestCase):
def test_pointer_string_proto_argtypes_error(self):
with self.assertWarns(DeprecationWarning):
BadType = ctypes.POINTER("BugTrigger")

if os.name == "nt":
libc = ctypes.WinDLL("kernel32.dll")
func = libc.GetCurrentProcessId
else:
libc = ctypes.CDLL(None)
func = libc.getpid

func.argtypes = (BadType,)

with self.assertRaises(ctypes.ArgumentError):
func(ctypes.byref(ctypes.c_int(0)))


if __name__ == '__main__':
unittest.main()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fixed a crash in ctypes when using a deprecated ``POINTER(str)`` type in
``argtypes``. Instead of aborting, ctypes now raises a proper Python
exception when the pointer target type is unresolved.
8 changes: 7 additions & 1 deletion Modules/_ctypes/_ctypes.c
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,13 @@ PyCPointerType_from_param_impl(PyObject *type, PyTypeObject *cls,
/* If we expect POINTER(<type>), but receive a <type> instance, accept
it by calling byref(<type>).
*/
assert(typeinfo->proto);
if(typeinfo->proto == NULL){
PyErr_SetString(
PyExc_TypeError,
"cannot convert argument: POINTER target type is unresolved"
);
return NULL;
}
switch (PyObject_IsInstance(value, typeinfo->proto)) {
case 1:
Py_INCREF(value); /* _byref steals a refcount */
Expand Down
Loading