Merge 3.5

vstinner · vstinner · commit 5b96f17b1c30 · 2016-01-27T17:01:13.000+01:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -911,6 +911,8 @@ resize_compact(PyObject *unicode, Py_ssize_t length)
     else if (_PyUnicode_HAS_WSTR_MEMORY(unicode)) {
         PyObject_DEL(_PyUnicode_WSTR(unicode));
         _PyUnicode_WSTR(unicode) = NULL;
+        if (!PyUnicode_IS_ASCII(unicode))
+            _PyUnicode_WSTR_LENGTH(unicode) = 0;
     }
 #ifdef Py_DEBUG
     unicode_fill_invalid(unicode, old_length);

Original file line number	Diff line number	Diff line change
`@@ -911,6 +911,8 @@ resize_compact(PyObject *unicode, Py_ssize_t length)`
`911`	`911`	`else if (_PyUnicode_HAS_WSTR_MEMORY(unicode)) {`
`912`	`912`	`PyObject_DEL(_PyUnicode_WSTR(unicode));`
`913`	`913`	`_PyUnicode_WSTR(unicode) = NULL;`
	`914`	`+ if (!PyUnicode_IS_ASCII(unicode))`
	`915`	`+ _PyUnicode_WSTR_LENGTH(unicode) = 0;`
`914`	`916`	`}`
`915`	`917`	`#ifdef Py_DEBUG`
`916`	`918`	`unicode_fill_invalid(unicode, old_length);`