From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Nov 2015 05:57:39 +0000 (-0800)
Subject: make the PyUnicode_FSConverter cleanup set the decrefed argument to NULL (closes... 
X-Git-Tag: v3.5.1rc1~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4d33b34286e30819b36cc9e6d357d16eca813e4;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index f72f8ac1f120..e6b3c5e72482 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 38f765da7279..8b885dfec2b3 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)) {