mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-99240: Reset pointer to NULL when the pointed memory is freed in argument parsing (#99890) 

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
This commit is contained in:
colorfulappl 2022-12-17 14:37:44 +08:00 committed by GitHub
parent 9cdd2fa63b
commit efbb1eb9f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_capi/test_getargs.py
View File

@ -1085,6 +1085,10 @@ def test_Z_hash(self):
with self.assertWarns(DeprecationWarning): with self.assertWarns(DeprecationWarning):
self.assertIsNone(getargs_Z_hash(None)) self.assertIsNone(getargs_Z_hash(None))
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): class Object_TestCase(unittest.TestCase):
def test_S(self): def test_S(self):

2
Misc/NEWS.d/next/C API/2022-11-30-16-39-22.gh-issue-99240.67nAX-.rst Normal file
View File

@ -0,0 +1,2 @@
In argument parsing, after deallocating newly allocated memory, reset its
pointer to NULL.

19
Modules/_testcapi/getargs.c
View File

@ -854,6 +854,24 @@ getargs_s_hash_int2(PyObject *self, PyObject *args, PyObject *kwargs)
Py_RETURN_NONE; 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;
}
static PyMethodDef test_methods[] = { static PyMethodDef test_methods[] = {
{"get_args", get_args, METH_VARARGS}, {"get_args", get_args, METH_VARARGS},
{"get_kwargs", _PyCFunction_CAST(get_kwargs), METH_VARARGS|METH_KEYWORDS}, {"get_kwargs", _PyCFunction_CAST(get_kwargs), METH_VARARGS|METH_KEYWORDS},
@ -906,6 +924,7 @@ static PyMethodDef test_methods[] = {
{"test_empty_argparse", test_empty_argparse, METH_NOARGS}, {"test_empty_argparse", test_empty_argparse, METH_NOARGS},
{"test_k_code", test_k_code, METH_NOARGS}, {"test_k_code", test_k_code, METH_NOARGS},
{"test_s_code", test_s_code, METH_NOARGS}, {"test_s_code", test_s_code, METH_NOARGS},
{"gh_99240_clear_args", gh_99240_clear_args, METH_VARARGS},
{NULL}, {NULL},
}; };

10
Python/getargs.c
View File

@ -202,9 +202,9 @@ _PyArg_VaParse_SizeT(PyObject *args, const char *format, va_list va)
static int static int
cleanup_ptr(PyObject *self, void *ptr) cleanup_ptr(PyObject *self, void *ptr)
{ {
if (ptr) { void **pptr = (void **)ptr;
PyMem_Free(ptr); PyMem_Free(*pptr);
} *pptr = NULL;
return 0; return 0;
} }
@ -1116,7 +1116,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
PyErr_NoMemory(); PyErr_NoMemory();
RETURN_ERR_OCCURRED; RETURN_ERR_OCCURRED;
} }
if (addcleanup(*buffer, freelist, cleanup_ptr)) { if (addcleanup(buffer, freelist, cleanup_ptr)) {
Py_DECREF(s); Py_DECREF(s);
return converterr( return converterr(
"(cleanup problem)", "(cleanup problem)",
@ -1162,7 +1162,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
PyErr_NoMemory(); PyErr_NoMemory();
RETURN_ERR_OCCURRED; RETURN_ERR_OCCURRED;
} }
if (addcleanup(*buffer, freelist, cleanup_ptr)) { if (addcleanup(buffer, freelist, cleanup_ptr)) {
Py_DECREF(s); Py_DECREF(s);
return converterr("(cleanup problem)", return converterr("(cleanup problem)",
arg, msgbuf, bufsize); arg, msgbuf, bufsize);