Issue #18561: Skip name in ctypes' _build_callargs() if name is NULL.

tiran · tiran · commit 6ca8a05f10b3 · 2013-07-26T23:04:29.000+02:00
CID 486199
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -3453,7 +3453,7 @@ _get_arg(int pindex, PyObject name, PyObject defval, PyObject inargs, PyObje`
`3453`	`3453`	`Py_INCREF(v);`
`3454`	`3454`	`return v;`
`3455`	`3455`	`}`
`3456`		`- if (kwds && (v = PyDict_GetItem(kwds, name))) {`
	`3456`	`+ if (kwds && name && (v = PyDict_GetItem(kwds, name))) {`
`3457`	`3457`	`++*pindex;`
`3458`	`3458`	`Py_INCREF(v);`
`3459`	`3459`	`return v;`