From 6ca8a05f10b37e068f7c7da196d0d97706b6f15f Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 26 Jul 2013 23:04:29 +0200 Subject: Issue #18561: Skip name in ctypes' _build_callargs() if name is NULL. CID 486199 --- Misc/NEWS | 2 ++ Modules/_ctypes/_ctypes.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 505fab5..769b80e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -54,6 +54,8 @@ Core and Builtins Library ------- +- Issue #18561: Skip name in ctypes' _build_callargs() if name is NULL. + - Issue #18559: Fix NULL pointer dereference error in _pickle module - Issue #18556: Check the return value of a PyUnicode_AsWideChar() call in diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index a025a73..9a37aac 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3453,7 +3453,7 @@ _get_arg(int *pindex, PyObject *name, PyObject *defval, PyObject *inargs, PyObje Py_INCREF(v); return v; } - if (kwds && (v = PyDict_GetItem(kwds, name))) { + if (kwds && name && (v = PyDict_GetItem(kwds, name))) { ++*pindex; Py_INCREF(v); return v; -- cgit v0.12