bpo-38622: Ensure ctypes.PyObj_FromPtr audit event passes tuples as a single argument (GH-17243)

zooba · web-flow · commit dcf1f83de867 · 2019-11-18T13:30:01.000-08:00
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
@@ -1631,7 +1631,7 @@ addressof(PyObject *self, PyObject *obj)
                         "invalid type");
         return NULL;
     }
-    if (PySys_Audit("ctypes.addressof", "O", obj) < 0) {
+    if (PySys_Audit("ctypes.addressof", "(O)", obj) < 0) {
         return NULL;
     }
     return PyLong_FromVoidPtr(((CDataObject *)obj)->b_ptr);
@@ -1651,7 +1651,7 @@ My_PyObj_FromPtr(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "O&:PyObj_FromPtr", converter, &ob)) {
         return NULL;
     }
-    if (PySys_Audit("ctypes.PyObj_FromPtr", "O", ob) < 0) {
+    if (PySys_Audit("ctypes.PyObj_FromPtr", "(O)", ob) < 0) {
         return NULL;
     }
     Py_INCREF(ob);

Original file line number	Diff line number	Diff line change
`@@ -1631,7 +1631,7 @@ addressof(PyObject self, PyObject obj)`
`1631`	`1631`	`"invalid type");`
`1632`	`1632`	`return NULL;`
`1633`	`1633`	`}`
`1634`		`- if (PySys_Audit("ctypes.addressof", "O", obj) < 0) {`
	`1634`	`+ if (PySys_Audit("ctypes.addressof", "(O)", obj) < 0) {`
`1635`	`1635`	`return NULL;`
`1636`	`1636`	`}`
`1637`	`1637`	`return PyLong_FromVoidPtr(((CDataObject *)obj)->b_ptr);`
`@@ -1651,7 +1651,7 @@ My_PyObj_FromPtr(PyObject self, PyObject args)`
`1651`	`1651`	`if (!PyArg_ParseTuple(args, "O&:PyObj_FromPtr", converter, &ob)) {`
`1652`	`1652`	`return NULL;`
`1653`	`1653`	`}`
`1654`		`- if (PySys_Audit("ctypes.PyObj_FromPtr", "O", ob) < 0) {`
	`1654`	`+ if (PySys_Audit("ctypes.PyObj_FromPtr", "(O)", ob) < 0) {`
`1655`	`1655`	`return NULL;`
`1656`	`1656`	`}`
`1657`	`1657`	`Py_INCREF(ob);`