changeset:   99152:d8d67b502bcc
parent:      99150:97e2a6810f7f
parent:      99151:3ae62099d70b
user:        Benjamin Peterson <benjamin@python.org>
date:        Sun Nov 15 21:57:50 2015 -0800
files:       Misc/NEWS Objects/unicodeobject.c
description:
merge 3.5 (#25630)


diff -r 97e2a6810f7f -r d8d67b502bcc Misc/NEWS
--- a/Misc/NEWS	Sun Nov 15 21:29:43 2015 -0800
+++ b/Misc/NEWS	Sun Nov 15 21:57:50 2015 -0800
@@ -10,6 +10,9 @@
 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 -r 97e2a6810f7f -r d8d67b502bcc Objects/unicodeobject.c
--- a/Objects/unicodeobject.c	Sun Nov 15 21:29:43 2015 -0800
+++ b/Objects/unicodeobject.c	Sun Nov 15 21:57:50 2015 -0800
@@ -3775,6 +3775,7 @@
     void *data;
     if (arg == NULL) {
         Py_DECREF(*(PyObject**)addr);
+        *(PyObject**)addr = NULL;
         return 1;
     }
     if (PyBytes_Check(arg)) {