diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-09-08 06:58:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 06:58:51 (GMT) |
| commit | e3b2b4b8d9e751b49e3550cb83ba39b54fdc377c (patch) | |
| tree | e3cf5fd257df7ac82e2bd47811720daf22ce0666 /Objects/unicodeobject.c | |
| parent | 70c2dd306f575e8bc9edb10ced5c7a6a555d1c87 (diff) | |
| download | cpython-e3b2b4b8d9e751b49e3550cb83ba39b54fdc377c.zip cpython-e3b2b4b8d9e751b49e3550cb83ba39b54fdc377c.tar.gz cpython-e3b2b4b8d9e751b49e3550cb83ba39b54fdc377c.tar.bz2 | |
bpo-31393: Fix the use of PyUnicode_READY(). (#3451)
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index db1516d..c4d93fc 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4185,10 +4185,13 @@ PyUnicode_ReadChar(PyObject *unicode, Py_ssize_t index) void *data; int kind; - if (!PyUnicode_Check(unicode) || PyUnicode_READY(unicode) == -1) { + if (!PyUnicode_Check(unicode)) { PyErr_BadArgument(); return (Py_UCS4)-1; } + if (PyUnicode_READY(unicode) == -1) { + return (Py_UCS4)-1; + } if (index < 0 || index >= PyUnicode_GET_LENGTH(unicode)) { PyErr_SetString(PyExc_IndexError, "string index out of range"); return (Py_UCS4)-1; @@ -11668,10 +11671,13 @@ unicode_getitem(PyObject *self, Py_ssize_t index) enum PyUnicode_Kind kind; Py_UCS4 ch; - if (!PyUnicode_Check(self) || PyUnicode_READY(self) == -1) { + if (!PyUnicode_Check(self)) { PyErr_BadArgument(); return NULL; } + if (PyUnicode_READY(self) == -1) { + return NULL; + } if (index < 0 || index >= PyUnicode_GET_LENGTH(self)) { PyErr_SetString(PyExc_IndexError, "string index out of range"); return NULL; |