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/codeobject.c

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 6de697a..d45be4c 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -22,8 +22,7 @@
     static const unsigned char *name_chars = (unsigned char *)NAME_CHARS;
     const unsigned char *s, *e;
 
-    if (!PyUnicode_Check(o) || PyUnicode_READY(o) == -1 ||
-        !PyUnicode_IS_ASCII(o))
+    if (!PyUnicode_IS_ASCII(o))
         return 0;
 
     if (ok_name_char[*name_chars] == 0) {
@@ -64,6 +63,10 @@
     for (i = PyTuple_GET_SIZE(tuple); --i >= 0; ) {
         PyObject *v = PyTuple_GET_ITEM(tuple, i);
         if (PyUnicode_CheckExact(v)) {
+            if (PyUnicode_READY(v) == -1) {
+                PyErr_Clear();
+                continue;
+            }
             if (all_name_chars(v)) {
                 PyObject *w = v;
                 PyUnicode_InternInPlace(&v);