summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-07-26 21:04:29 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-07-26 21:04:29 (GMT)
commit6ca8a05f10b37e068f7c7da196d0d97706b6f15f (patch)
treee81776228af77d691f4af19bf759fbb7f7c09493
parent704e2d374f88bca83339b95d559b0abce12dc6bd (diff)
downloadcpython-6ca8a05f10b37e068f7c7da196d0d97706b6f15f.zip
cpython-6ca8a05f10b37e068f7c7da196d0d97706b6f15f.tar.gz
cpython-6ca8a05f10b37e068f7c7da196d0d97706b6f15f.tar.bz2
Issue #18561: Skip name in ctypes' _build_callargs() if name is NULL.
CID 486199
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_ctypes/_ctypes.c2
2 files changed, 3 insertions, 1 deletions
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;