Add functional test for Argument Clinic

Author: colorfulappl

Include/internal/pycore_global_strings.h

@@ -425,6 +425,9 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(keyfile)
         STRUCT_FOR_ID(keys)
         STRUCT_FOR_ID(kind)
+        STRUCT_FOR_ID(kw)
+        STRUCT_FOR_ID(kw1)
+        STRUCT_FOR_ID(kw2)
         STRUCT_FOR_ID(lambda)
         STRUCT_FOR_ID(last)
         STRUCT_FOR_ID(last_node)
@@ -516,6 +519,8 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(pid)
         STRUCT_FOR_ID(policy)
         STRUCT_FOR_ID(pos)
+        STRUCT_FOR_ID(pos1)
+        STRUCT_FOR_ID(pos2)
         STRUCT_FOR_ID(print_file_and_line)
         STRUCT_FOR_ID(priority)
         STRUCT_FOR_ID(progress)

Include/internal/pycore_runtime_init_generated.h

@@ -0,0 +1,16 @@
+import unittest
+from test.support import import_helper
+
+ac_tester = import_helper.import_module('_testclinicfunctionality')
+
+
+class TestClinicFunctionality(unittest.TestCase):
+    def test_gh_32092_oob(self):
+        res = ac_tester.gh_32092_oob(1, 2, 3, 4, kw1=5, kw2=6)
+        expect = (1, 2, (3, 4), 5, 6)
+        self.assertEqual(res, expect)
+
+    def test_gh_32092_kw_pass(self):
+        res = ac_tester.gh_32092_kw_pass(1, 2, 3)
+        expect = (1, (2, 3), None)
+        self.assertEqual(res, expect)

Lib/test/test_clinic_functionality.py

@@ -170,6 +170,7 @@
 @MODULE__TESTBUFFER_TRUE@_testbuffer _testbuffer.c
 @MODULE__TESTINTERNALCAPI_TRUE@_testinternalcapi _testinternalcapi.c
 @MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c _testcapi/vectorcall.c _testcapi/vectorcall_limited.c _testcapi/heaptype.c _testcapi/unicode.c
+@MODULE__TESTCLINICFUNCTIONALITY_TRUE@_testclinicfunctionality _testclinicfunctionality.c
 
 # Some testing modules MUST be built as shared libraries.
 *shared*

Modules/Setup.stdlib.in

@@ -0,0 +1,105 @@
+#ifndef Py_BUILD_CORE_BUILTIN
+#  define Py_BUILD_CORE_MODULE 1
+#endif
+
+/* Always enable assertions */
+#undef NDEBUG
+
+#define PY_SSIZE_T_CLEAN
+
+#include "Python.h"
+
+#include "clinic/_testclinicfunctionality.c.h"
+
+/*[clinic input]
+module  _testclinicfunctionality
+[clinic start generated code]*/
+/*[clinic end generated code: output=da39a3ee5e6b4b0d input=19bd80db1aefb188]*/
+
+/*[clinic input]
+gh_32092_oob
+
+    pos1: object
+    pos2: object
+    *varargs: object
+    kw1: object = None
+    kw2: object = None
+
+Proof-of-concept of GH-32092 OOB bug.
+
+Array index out-of-bound bug in function
+`_PyArg_UnpackKeywordsWithVararg` .
+
+Calling this function by gh_32092_oob(1, 2, 3, 4, kw1=5, kw2=6)
+to trigger this bug (crash).
+Expected return: (1, 2, (3, 4), 5, 6)
+
+[clinic start generated code]*/
+
+static PyObject *
+gh_32092_oob_impl(PyObject *module, PyObject *pos1, PyObject *pos2,
+                  PyObject *varargs, PyObject *kw1, PyObject *kw2)
+/*[clinic end generated code: output=ee259c130054653f input=91d8e227acf93b02]*/
+{
+    PyObject *tuple = PyTuple_New(5);
+    PyTuple_SET_ITEM(tuple, 0, Py_NewRef(pos1));
+    PyTuple_SET_ITEM(tuple, 1, Py_NewRef(pos2));
+    PyTuple_SET_ITEM(tuple, 2, Py_NewRef(varargs));
+    PyTuple_SET_ITEM(tuple, 3, Py_NewRef(kw1));
+    PyTuple_SET_ITEM(tuple, 4, Py_NewRef(kw2));
+    return tuple;
+}
+
+/*[clinic input]
+gh_32092_kw_pass
+
+    pos: object
+    *args: object
+    kw: object = None
+
+Proof-of-concept of GH-32092 keyword args passing bug.
+
+The calculation of `noptargs` in AC-generated function
+`builtin_kw_pass_poc` is incorrect.
+
+Calling this function by gh_32092_kw_pass(1, 2, 3)
+to trigger this bug (crash).
+Expected return: (1, (2, 3), None)
+
+[clinic start generated code]*/
+
+static PyObject *
+gh_32092_kw_pass_impl(PyObject *module, PyObject *pos, PyObject *args,
+                      PyObject *kw)
+/*[clinic end generated code: output=4a2bbe4f7c8604e9 input=5fc48f72f49193b6]*/
+{
+    PyObject *tuple = PyTuple_New(3);
+    PyTuple_SET_ITEM(tuple, 0, Py_NewRef(pos));
+    PyTuple_SET_ITEM(tuple, 1, Py_NewRef(args));
+    PyTuple_SET_ITEM(tuple, 2, Py_NewRef(kw));
+    return tuple;
+}
+
+static PyMethodDef tester_methods[] = {
+        GH_32092_OOB_METHODDEF
+        GH_32092_KW_PASS_METHODDEF
+        {NULL, NULL}
+};
+
+static struct PyModuleDef _testclinicfunctionality_module = {
+        PyModuleDef_HEAD_INIT,
+        "_testclinicfunctionality",
+        NULL,
+        0,
+        tester_methods,
+        NULL,
+        NULL,
+        NULL,
+        NULL
+};
+
+PyMODINIT_FUNC
+PyInit__testclinicfunctionality(void)
+{
+    return PyModule_Create(&_testclinicfunctionality_module);
+}