changeset:   99419:a0e2376768dc
branch:      3.5
parent:      99416:c0522985bd7c
parent:      99418:67718032badb
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Thu Dec 03 01:04:37 2015 +0200
files:       Lib/test/test_unicode.py Misc/NEWS Objects/clinic/unicodeobject.c.h Objects/unicodeobject.c
description:
Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.


diff -r c0522985bd7c -r a0e2376768dc Lib/test/test_unicode.py
--- a/Lib/test/test_unicode.py	Thu Dec 03 00:57:41 2015 +0200
+++ b/Lib/test/test_unicode.py	Thu Dec 03 01:04:37 2015 +0200
@@ -2702,6 +2702,23 @@
         self.assertTrue(astral >= bmp2)
         self.assertFalse(astral >= astral2)
 
+    @support.cpython_only
+    def test_pep393_utf8_caching_bug(self):
+        # Issue #25709: Problem with string concatenation and utf-8 cache
+        from _testcapi import getargs_s_hash
+        for k in 0x24, 0xa4, 0x20ac, 0x1f40d:
+            s = ''
+            for i in range(5):
+                # Due to CPython specific optimization the 's' string can be
+                # resized in-place.
+                s += chr(k)
+                # Parsing with the "s#" format code calls indirectly
+                # PyUnicode_AsUTF8AndSize() which creates the UTF-8
+                # encoded string cached in the Unicode object.
+                self.assertEqual(getargs_s_hash(s), chr(k).encode() * (i + 1))
+                # Check that the second call returns the same result
+                self.assertEqual(getargs_s_hash(s), chr(k).encode() * (i + 1))
+
 
 class StringModuleTest(unittest.TestCase):
     def test_formatter_parser(self):
diff -r c0522985bd7c -r a0e2376768dc Misc/NEWS
--- a/Misc/NEWS	Thu Dec 03 00:57:41 2015 +0200
+++ b/Misc/NEWS	Thu Dec 03 01:04:37 2015 +0200
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
+
 - Issue #24097: Fixed crash in object.__reduce__() if slot name is freed inside
   __getattr__.
 
diff -r c0522985bd7c -r a0e2376768dc Objects/unicodeobject.c
--- a/Objects/unicodeobject.c	Thu Dec 03 00:57:41 2015 +0200
+++ b/Objects/unicodeobject.c	Thu Dec 03 01:04:37 2015 +0200
@@ -722,6 +722,11 @@
     }
     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);