Commit a4d33b34 authored by Benjamin Peterson's avatar Benjamin Peterson

make the PyUnicode_FSConverter cleanup set the decrefed argument to NULL (closes #25630)

parent d0a5b1c3
...@@ -11,6 +11,9 @@ Release date: TBA ...@@ -11,6 +11,9 @@ Release date: TBA
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #25630: Fix a possible segfault during argument parsing in functions
that accept filesystem paths.
- Issue #23564: Fixed a partially broken sanity check in the _posixsubprocess - Issue #23564: Fixed a partially broken sanity check in the _posixsubprocess
internals regarding how fds_to_pass were passed to the child. The bug had internals regarding how fds_to_pass were passed to the child. The bug had
no actual impact as subprocess.py already avoided it. no actual impact as subprocess.py already avoided it.
......
...@@ -3614,6 +3614,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr) ...@@ -3614,6 +3614,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr)
void *data; void *data;
if (arg == NULL) { if (arg == NULL) {
Py_DECREF(*(PyObject**)addr); Py_DECREF(*(PyObject**)addr);
*(PyObject**)addr = NULL;
return 1; return 1;
} }
if (PyBytes_Check(arg)) { if (PyBytes_Check(arg)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment