[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#25630)

[benjamin.peterson]

https://hg.python.org/cpython/rev/d8d67b502bcc
changeset:   99152:d8d67b502bcc
parent:      99150:97e2a6810f7f
parent:      99151:3ae62099d70b
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Nov 15 21:57:50 2015 -0800
summary:
  merge 3.5 (#25630)

files:
  Misc/NEWS               |  3 +++
  Objects/unicodeobject.c |  1 +
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3775,6 +3775,7 @@
     void *data;
     if (arg == NULL) {
         Py_DECREF(*(PyObject**)addr);
+        *(PyObject**)addr = NULL;
         return 1;
     }
     if (PyBytes_Check(arg)) {

-- 
Repository URL: https://hg.python.org/cpython