merge 3.5 (python#25630)

benjaminp · benjaminp · commit d798dc1034c2 · 2015-11-15T21:57:50.000-08:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: XXXX-XX-XX
 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
@@ -3775,6 +3775,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)) {

Original file line number	Diff line number	Diff line change
`@@ -3775,6 +3775,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr)`
`3775`	`3775`	`void *data;`
`3776`	`3776`	`if (arg == NULL) {`
`3777`	`3777`	`Py_DECREF((PyObject*)addr);`
	`3778`	`+ (PyObject*)addr = NULL;`
`3778`	`3779`	`return 1;`
`3779`	`3780`	`}`
`3780`	`3781`	`if (PyBytes_Check(arg)) {`