From 9f789e7f63809302b887a5fff8e186768c6d3a16 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 1 Oct 2011 03:57:28 +0200 Subject: [PATCH 1/2] _PyUnicode_AsKind() is *not* part of the stable ABI --- Include/unicodeobject.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index c41d7871c81..bba1c23f987 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -795,7 +795,9 @@ PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString( Py_ssize_t *size /* number of characters of the result */ ); +#ifndef Py_LIMITED_API PyAPI_FUNC(void*) _PyUnicode_AsKind(PyObject *s, unsigned int kind); +#endif #endif From de636f3c34f326fc7b07e4288d411be38d2a299c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 1 Oct 2011 03:55:54 +0200 Subject: [PATCH 2/2] PyUnicode_Substring() now accepts end bigger than string length Fix also a bug: call PyUnicode_READY() before reading string length. --- Objects/unicodeobject.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 92208f462c1..e42e824fd3a 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -10447,6 +10447,11 @@ PyUnicode_Substring(PyObject *self, Py_ssize_t start, Py_ssize_t end) int kind; Py_ssize_t length; + if (PyUnicode_READY(self) == -1) + return NULL; + + end = Py_MIN(end, PyUnicode_GET_LENGTH(self)); + if (start == 0 && end == PyUnicode_GET_LENGTH(self)) { if (PyUnicode_CheckExact(self)) { @@ -10461,13 +10466,11 @@ PyUnicode_Substring(PyObject *self, Py_ssize_t start, Py_ssize_t end) if (length == 1) return unicode_getitem((PyUnicodeObject*)self, start); - if (start < 0 || end < 0 || end > PyUnicode_GET_LENGTH(self)) { + if (start < 0 || end < 0) { PyErr_SetString(PyExc_IndexError, "string index out of range"); return NULL; } - if (PyUnicode_READY(self) == -1) - return NULL; kind = PyUnicode_KIND(self); data = PyUnicode_1BYTE_DATA(self); return PyUnicode_FromKindAndData(kind,