[Python-checkins] [3.11] gh-99240: Reset pointer to NULL when the pointed memory is freed in argument parsing (GH-99890) (#100385)
kumaraditya303
webhook-mailer at python.org
Wed Dec 21 05:02:46 EST 2022
https://github.com/python/cpython/commit/bed1d141a95e8d69f522e6f4e46e0647c68a2460
commit: bed1d141a95e8d69f522e6f4e46e0647c68a2460
branch: 3.11
author: colorfulappl <colorfulappl at qq.com>
committer: kumaraditya303 <59607654+kumaraditya303 at users.noreply.github.com>
date: 2022-12-21T15:32:29+05:30
summary:
[3.11] gh-99240: Reset pointer to NULL when the pointed memory is freed in argument parsing (GH-99890) (#100385)
(cherry picked from commit efbb1eb9f54cad4f7bf5df03eed3a6aba02d99f4)
Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
Co-authored-by: Erlend E. Aasland <erlend.aasland at protonmail.com>
files:
A Misc/NEWS.d/next/C API/2022-11-30-16-39-22.gh-issue-99240.67nAX-.rst
M Lib/test/test_capi/test_getargs.py
M Modules/_testcapimodule.c
M Python/getargs.c
diff --git a/Lib/test/test_capi/test_getargs.py b/Lib/test/test_capi/test_getargs.py
index 72b6d64a4986..552fa2135247 100644
--- a/Lib/test/test_capi/test_getargs.py
+++ b/Lib/test/test_capi/test_getargs.py
@@ -1098,6 +1098,10 @@ def test_Z_hash(self):
warnings.simplefilter('error', DeprecationWarning)
self.assertRaises(DeprecationWarning, getargs_Z_hash, 'abc\xe9')
+ def test_gh_99240_clear_args(self):
+ from _testcapi import gh_99240_clear_args
+ self.assertRaises(TypeError, gh_99240_clear_args, 'a', '\0b')
+
class Object_TestCase(unittest.TestCase):
def test_S(self):
diff --git a/Misc/NEWS.d/next/C API/2022-11-30-16-39-22.gh-issue-99240.67nAX-.rst b/Misc/NEWS.d/next/C API/2022-11-30-16-39-22.gh-issue-99240.67nAX-.rst
new file mode 100644
index 000000000000..9a1bb3cf5a73
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-11-30-16-39-22.gh-issue-99240.67nAX-.rst
@@ -0,0 +1,2 @@
+In argument parsing, after deallocating newly allocated memory, reset its
+pointer to NULL.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 1291eff481cb..70242d78ab8c 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6192,6 +6192,7 @@ function_get_module(PyObject *self, PyObject *func)
static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
static PyObject *getargs_s_hash_int2(PyObject *, PyObject *, PyObject*);
+static PyObject *gh_99240_clear_args(PyObject *, PyObject *);
static PyMethodDef TestMethods[] = {
{"raise_exception", raise_exception, METH_VARARGS},
@@ -6308,6 +6309,7 @@ static PyMethodDef TestMethods[] = {
METH_VARARGS|METH_KEYWORDS},
{"getargs_s_hash_int2", _PyCFunction_CAST(getargs_s_hash_int2),
METH_VARARGS|METH_KEYWORDS},
+ {"gh_99240_clear_args", gh_99240_clear_args, METH_VARARGS},
{"getargs_z", getargs_z, METH_VARARGS},
{"getargs_z_star", getargs_z_star, METH_VARARGS},
{"getargs_z_hash", getargs_z_hash, METH_VARARGS},
@@ -8089,3 +8091,21 @@ getargs_s_hash_int2(PyObject *self, PyObject *args, PyObject *kwargs)
PyBuffer_Release(&buf);
Py_RETURN_NONE;
}
+
+static PyObject *
+gh_99240_clear_args(PyObject *self, PyObject *args)
+{
+ char *a = NULL;
+ char *b = NULL;
+
+ if (!PyArg_ParseTuple(args, "eses", "idna", &a, "idna", &b)) {
+ if (a || b) {
+ PyErr_Clear();
+ PyErr_SetString(PyExc_AssertionError, "Arguments are not cleared.");
+ }
+ return NULL;
+ }
+ PyMem_Free(a);
+ PyMem_Free(b);
+ Py_RETURN_NONE;
+}
diff --git a/Python/getargs.c b/Python/getargs.c
index c3e3cf155b87..9d6483f4fe0f 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -202,9 +202,9 @@ _PyArg_VaParse_SizeT(PyObject *args, const char *format, va_list va)
static int
cleanup_ptr(PyObject *self, void *ptr)
{
- if (ptr) {
- PyMem_Free(ptr);
- }
+ void **pptr = (void **)ptr;
+ PyMem_Free(*pptr);
+ *pptr = NULL;
return 0;
}
@@ -1169,7 +1169,7 @@ _Py_COMP_DIAG_POP
PyErr_NoMemory();
RETURN_ERR_OCCURRED;
}
- if (addcleanup(*buffer, freelist, cleanup_ptr)) {
+ if (addcleanup(buffer, freelist, cleanup_ptr)) {
Py_DECREF(s);
return converterr(
"(cleanup problem)",
@@ -1215,7 +1215,7 @@ _Py_COMP_DIAG_POP
PyErr_NoMemory();
RETURN_ERR_OCCURRED;
}
- if (addcleanup(*buffer, freelist, cleanup_ptr)) {
+ if (addcleanup(buffer, freelist, cleanup_ptr)) {
Py_DECREF(s);
return converterr("(cleanup problem)",
arg, msgbuf, bufsize);
More information about the Python-checkins
mailing list