diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-11-16 05:57:50 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-11-16 05:57:50 (GMT) |
| commit | d798dc1034c29bc31f7d7be8a84335e67921fe13 (patch) | |
| tree | f70f0b628d98ce6ad3376406fbeff6e9a5c0364e /Objects/unicodeobject.c | |
| parent | f31f9718ac4ebd7ca90eb0fc77e2a72b9d362654 (diff) | |
| parent | a4d33b34286e30819b36cc9e6d357d16eca813e4 (diff) | |
| download | cpython-d798dc1034c29bc31f7d7be8a84335e67921fe13.zip cpython-d798dc1034c29bc31f7d7be8a84335e67921fe13.tar.gz cpython-d798dc1034c29bc31f7d7be8a84335e67921fe13.tar.bz2 | |
merge 3.5 (#25630)
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index c2b6f64..47c97cc 100644 --- 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)) { |