Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 9 commits into from
Dec 17, 2022
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9271e85
Reset pointer to NULL when memory is freed
colorfulappl Nov 30, 2022
eba62a3
Add news
colorfulappl Nov 30, 2022
39895ee
Remove unnecessary null-check
colorfulappl Dec 14, 2022
ef866b2
Add test
colorfulappl Dec 15, 2022
357576b
Fix an error
colorfulappl Dec 16, 2022
0424701
PyMem_FREE -> PyMem_Free
kumaraditya303 Dec 16, 2022
4a7d386
Update Modules/_testcapi/getargs.c
kumaraditya303 Dec 16, 2022
1d3b069
Merge branch 'main' into clear_freed_pointer
kumaraditya303 Dec 16, 2022
6e9744c
Update Modules/_testcapi/getargs.c
erlend-aasland Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/test/test_capi/test_getargs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,10 @@ def test_Z_hash(self):
with self.assertWarns(DeprecationWarning):
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):
def test_S(self):
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/C API/2022-11-30-16-39-22.gh-issue-99240.67nAX-.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
In argument parsing, after deallocating newly allocated memory, reset its
pointer to NULL.
18 changes: 18 additions & 0 deletions Modules/_testcapi/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,23 @@ getargs_s_hash_int2(PyObject *self, PyObject *args, PyObject *kwargs)
Py_RETURN_NONE;
}

static PyObject *
gh_99240_clear_args(PyObject *self, PyObject *args) {
erlend-aasland marked this conversation as resolved.
Show resolved Hide resolved
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 is not cleared.");
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
}
return NULL;
}
PyMem_FREE(a);
PyMem_FREE(b);
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
Py_RETURN_NONE;
}

static PyMethodDef test_methods[] = {
{"get_args", get_args, METH_VARARGS},
{"get_kwargs", _PyCFunction_CAST(get_kwargs), METH_VARARGS|METH_KEYWORDS},
Expand Down Expand Up @@ -906,6 +923,7 @@ static PyMethodDef test_methods[] = {
{"test_empty_argparse", test_empty_argparse, METH_NOARGS},
{"test_k_code", test_k_code, METH_NOARGS},
{"test_s_code", test_s_code, METH_NOARGS},
{"gh_99240_clear_args", gh_99240_clear_args, METH_VARARGS},
{NULL},
};

Expand Down
10 changes: 5 additions & 5 deletions Python/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -1116,7 +1116,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
PyErr_NoMemory();
RETURN_ERR_OCCURRED;
}
if (addcleanup(*buffer, freelist, cleanup_ptr)) {
if (addcleanup(buffer, freelist, cleanup_ptr)) {
Py_DECREF(s);
return converterr(
"(cleanup problem)",
Expand Down Expand Up @@ -1162,7 +1162,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
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);
Expand Down