summaryrefslogtreecommitdiffstats
path: root/Objects/unicodeobject.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-12-02 23:04:37 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-12-02 23:04:37 (GMT)
commit6648bf5661b79f5b40385b21570dff6f146c5eb5 (patch)
tree2bad11de9ee858dad1be1567c81097eb1573473a /Objects/unicodeobject.c
parent38982e543a3ac61d30cfa98d36ab6e5ff7acc852 (diff)
parent7aa690860eceb74332c1edad1b8a7c4956bbdad5 (diff)
downloadcpython-6648bf5661b79f5b40385b21570dff6f146c5eb5.zip
cpython-6648bf5661b79f5b40385b21570dff6f146c5eb5.tar.gz
cpython-6648bf5661b79f5b40385b21570dff6f146c5eb5.tar.bz2
Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
Diffstat (limited to 'Objects/unicodeobject.c')
-rw-r--r--Objects/unicodeobject.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 8b885df..0b78301 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -722,6 +722,11 @@ resize_compact(PyObject *unicode, Py_ssize_t length)
}
new_size = (struct_size + (length + 1) * char_size);
+ if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) {
+ PyObject_DEL(_PyUnicode_UTF8(unicode));
+ _PyUnicode_UTF8(unicode) = NULL;
+ _PyUnicode_UTF8_LENGTH(unicode) = 0;
+ }
_Py_DEC_REFTOTAL;
_Py_ForgetReference(unicode);