mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge 3.5 (#25630)

Browse source
This commit is contained in:
Benjamin Peterson 2015-11-15 21:57:50 -08:00
commit d798dc1034
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -10,6 +10,9 @@ Release date: XXXX-XX-XX
Core and Builtins 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 - 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 internals regarding how fds_to_pass were passed to the child. The bug had
no actual impact as subprocess.py already avoided it. no actual impact as subprocess.py already avoided it.

1
Objects/unicodeobject.c
View file

@ -3775,6 +3775,7 @@ PyUnicode_FSConverter(PyObject* arg, void* addr)
void *data; void *data;
if (arg == NULL) { if (arg == NULL) {
Py_DECREF(*(PyObject**)addr); Py_DECREF(*(PyObject**)addr);
*(PyObject**)addr = NULL;
return 1; return 1;
} }
if (PyBytes_Check(arg)) { if (PyBytes_Check(arg)) {