commit ddb536ba7b7c6022424e39d666c3cc81772645c0
author Serhiy Storchaka <storchaka@gmail.com> Fri Sep 08 10:43:54 2017 +0300
committer GitHub <noreply@github.com> Fri Sep 08 10:43:54 2017 +0300
tree 48ba8d3f97ac4b4b060c910db81cf48bb16ba896
parent 9f2b3d4c2899f9caea2e47063061a76e460ac618

[3.6] bpo-31393: Fix the use of PyUnicode_READY(). (GH-3451). (#3453)

(cherry picked from commit e3b2b4b8d9e751b49e3550cb83ba39b54fdc377c)

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1650370..1f221af 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4210,10 +4210,13 @@
     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;
@@ -11706,10 +11709,13 @@
     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;