From 875f29bb95ffa76b6dbbf87cacfe525f9bc5031d Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 4 Oct 2011 20:00:49 +0200 Subject: =?UTF-8?q?Fix=20na=C3=AFve=20heuristic=20in=20unicode=20slicing?= =?UTF-8?q?=20(followup=20to=201b4f886dc9e2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Objects/unicodeobject.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 594623c..a958951 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -12258,7 +12258,8 @@ unicode_subscript(PyUnicodeObject* self, PyObject* item) Py_ssize_t start, stop, step, slicelength, cur, i; PyObject *result; void *src_data, *dest_data; - int kind; + int src_kind, dest_kind; + Py_UCS4 ch, max_char; if (PySlice_GetIndicesEx(item, PyUnicode_GET_LENGTH(self), &start, &stop, &step, &slicelength) < 0) { @@ -12276,17 +12277,24 @@ unicode_subscript(PyUnicodeObject* self, PyObject* item) return PyUnicode_Substring((PyObject*)self, start, start + slicelength); } - /* General (less optimized) case */ - result = PyUnicode_New(slicelength, PyUnicode_MAX_CHAR_VALUE(self)); + /* General case */ + max_char = 127; + src_kind = PyUnicode_KIND(self); + src_data = PyUnicode_DATA(self); + for (cur = start, i = 0; i < slicelength; cur += step, i++) { + ch = PyUnicode_READ(src_kind, src_data, cur); + if (ch > max_char) + max_char = ch; + } + result = PyUnicode_New(slicelength, max_char); if (result == NULL) return NULL; - kind = PyUnicode_KIND(self); - src_data = PyUnicode_DATA(self); + dest_kind = PyUnicode_KIND(result); dest_data = PyUnicode_DATA(result); for (cur = start, i = 0; i < slicelength; cur += step, i++) { - Py_UCS4 ch = PyUnicode_READ(kind, src_data, cur); - PyUnicode_WRITE(kind, dest_data, i, ch); + Py_UCS4 ch = PyUnicode_READ(src_kind, src_data, cur); + PyUnicode_WRITE(dest_kind, dest_data, i, ch); } return result; } else { -- cgit v0.12