Fix resize_compact()

vstinner · vstinner · commit 5bc03a6d4d5d · 2016-01-27T16:56:53.000+01:00
Issue #26217: resize_compact() must set wstr_length to 0 after freeing the wstr string. Otherwise, an assertion fails in _PyUnicode_CheckConsistency().
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -748,6 +748,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
`@@ -748,6 +748,8 @@ resize_compact(PyObject *unicode, Py_ssize_t length)`
`748`	`748`	`else if (_PyUnicode_HAS_WSTR_MEMORY(unicode)) {`
`749`	`749`	`PyObject_DEL(_PyUnicode_WSTR(unicode));`
`750`	`750`	`_PyUnicode_WSTR(unicode) = NULL;`
	`751`	`+ if (!PyUnicode_IS_ASCII(unicode))`
	`752`	`+ _PyUnicode_WSTR_LENGTH(unicode) = 0;`
`751`	`753`	`}`
`752`	`754`	`#ifdef Py_DEBUG`
`753`	`755`	`unicode_fill_invalid(unicode, old_length);`