gh-96821: Fix undefined behaviour in _testcapimodule.c (GH-96915) (GH-96926)

miss-islington · CAM-Gerlach · matthiasgoergens · web-flow · commit 88a3f1873ec4 · 2022-09-19T18:20:23.000+08:00
* gh-96821: Assert for demonstrating undefined behaviour * Fix UB (cherry picked from commit cbdeda8) Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM> Co-authored-by: Matthias Görgens <matthias.goergens@gmail.com>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-09-18-08-47-40.gh-issue-96821.Co2iOq.rst b/Misc/NEWS.d/next/Core and Builtins/2022-09-18-08-47-40.gh-issue-96821.Co2iOq.rst
@@ -0,0 +1 @@
+Fix undefined behaviour in ``_testcapimodule.c``.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -5475,8 +5475,10 @@ meth_fastcall_keywords(PyObject* self, PyObject* const* args,
     if (pyargs == NULL) {
         return NULL;
     }
+    assert(args != NULL || nargs == 0);
+    PyObject* const* args_offset = args == NULL ? NULL : args + nargs;
     PyObject *pykwargs = PyObject_Vectorcall((PyObject*)&PyDict_Type,
-                                              args + nargs, 0, kwargs);
+                                              args_offset, 0, kwargs);
     return Py_BuildValue("NNN", _null_to_none(self), pyargs, pykwargs);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix undefined behaviour in ``_testcapimodule.c``.
Original file line number	Diff line number	Diff line change
`@@ -5475,8 +5475,10 @@ meth_fastcall_keywords(PyObject* self, PyObject* const* args,`
`5475`	`5475`	`if (pyargs == NULL) {`
`5476`	`5476`	`return NULL;`
`5477`	`5477`	`}`
	`5478`	`+ assert(args != NULL \|\| nargs == 0);`
	`5479`	`+ PyObject* const* args_offset = args == NULL ? NULL : args + nargs;`
`5478`	`5480`	`PyObject pykwargs = PyObject_Vectorcall((PyObject)&PyDict_Type,`
`5479`		`- args + nargs, 0, kwargs);`
	`5481`	`+ args_offset, 0, kwargs);`
`5480`	`5482`	`return Py_BuildValue("NNN", _null_to_none(self), pyargs, pykwargs);`
`5481`	`5483`	`}`
`5482`	`5484`