From a4d33b34286e30819b36cc9e6d357d16eca813e4 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 15 Nov 2015 21:57:39 -0800 Subject: make the PyUnicode_FSConverter cleanup set the decrefed argument to NULL (closes #25630) --- Misc/NEWS | 3 +++ Objects/unicodeobject.c | 1 + 2 files changed, 4 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index f72f8ac..e6b3c5e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -11,6 +11,9 @@ Release date: TBA 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 internals regarding how fds_to_pass were passed to the child. The bug had no actual impact as subprocess.py already avoided it. diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 38f765d..8b885df 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3614,6 +3614,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr) void *data; if (arg == NULL) { Py_DECREF(*(PyObject**)addr); + *(PyObject**)addr = NULL; return 1; } if (PyBytes_Check(arg)) { -- cgit v0.12