mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2011-10-01 00:12:20 -04:00
commit 5c0fb00ad8
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/unicodeobject.h
View file

@ -795,7 +795,9 @@ PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString(
Py_ssize_t *size /* number of characters of the result */ Py_ssize_t *size /* number of characters of the result */
); );
#ifndef Py_LIMITED_API
PyAPI_FUNC(void*) _PyUnicode_AsKind(PyObject *s, unsigned int kind); PyAPI_FUNC(void*) _PyUnicode_AsKind(PyObject *s, unsigned int kind);
#endif
#endif #endif

9
Objects/unicodeobject.c
View file

@ -10446,6 +10446,11 @@ PyUnicode_Substring(PyObject *self, Py_ssize_t start, Py_ssize_t end)
int kind; int kind;
Py_ssize_t length; 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 (start == 0 && end == PyUnicode_GET_LENGTH(self))
{ {
if (PyUnicode_CheckExact(self)) { if (PyUnicode_CheckExact(self)) {
@ -10460,13 +10465,11 @@ PyUnicode_Substring(PyObject *self, Py_ssize_t start, Py_ssize_t end)
if (length == 1) if (length == 1)
return unicode_getitem((PyUnicodeObject*)self, start); 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"); PyErr_SetString(PyExc_IndexError, "string index out of range");
return NULL; return NULL;
} }
if (PyUnicode_READY(self) == -1)
return NULL;
kind = PyUnicode_KIND(self); kind = PyUnicode_KIND(self);
data = PyUnicode_1BYTE_DATA(self); data = PyUnicode_1BYTE_DATA(self);
return PyUnicode_FromKindAndData(kind, return PyUnicode_FromKindAndData(kind,