[Python-checkins] cpython: Partial revert of changeset 9744b2df134c

Thu Apr 18 09:43:19 CEST 2013

http://hg.python.org/cpython/rev/cb392bce91e6
changeset: 83438:cb392bce91e6
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Apr 18 09:41:34 2013 +0200
summary:
 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).
files:
 Objects/unicodeobject.c | 11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -10748,12 +10748,11 @@
 && !(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_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;
 
-- 
Repository URL: http://hg.python.org/cpython
