From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 18 Apr 2013 07:41:34 +0000 (+0200)
Subject: Partial revert of changeset 9744b2df134c
X-Git-Tag: v3.4.0a1~890
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb4503f61e5e2f2fb0a5c00950b9560bb46a5eb4;p=python

Partial revert of changeset 9744b2df134c

PyUnicode_Append() cannot call directly resize_compact(): I forgot that a
string can be ready *and* not compact (a legacy string can also be ready).
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 076674c68b..4c532afc3e 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -10748,12 +10748,11 @@ PyUnicode_Append(PyObject **p_left, PyObject *right)
         && !(PyUnicode_IS_ASCII(left) && !PyUnicode_IS_ASCII(right)))
     {
         /* append inplace */
-        res = resize_compact(left, new_len);
-        if (res == NULL)
+        if (unicode_resize(p_left, new_len) != 0)
             goto error;
 
-        /* copy 'right' into the newly allocated area of 'res' (left) */
-        _PyUnicode_FastCopyCharacters(res, left_len, right, 0, right_len);
+        /* copy 'right' into the newly allocated area of 'left' */
+        _PyUnicode_FastCopyCharacters(*p_left, left_len, right, 0, right_len);
     }
     else {
         maxchar = PyUnicode_MAX_CHAR_VALUE(left);
@@ -10767,8 +10766,8 @@ PyUnicode_Append(PyObject **p_left, PyObject *right)
         _PyUnicode_FastCopyCharacters(res, 0, left, 0, left_len);
         _PyUnicode_FastCopyCharacters(res, left_len, right, 0, right_len);
         Py_DECREF(left);
+        *p_left = res;
     }
-    *p_left = res;
     assert(_PyUnicode_CheckConsistency(*p_left, 1));
     return;