Merge branch '0.29.x'

4d928725 · Stefan Behnel · 64aafe56 · a7a3dafc · 4d928725
Commit 4d928725 authored Jun 19, 2020 by Stefan Behnel
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Cython/Utility/ImportExport.c Cython/Utility/ImportExport.c +3 -2

No files found.
--- a/Cython/Utility/ImportExport.c
+++ b/Cython/Utility/ImportExport.c
@@ -296,10 +296,11 @@ __Pyx_import_all_from(PyObject *locals, PyObject *v)
        }
        if (skip_leading_underscores &&
 #if PY_MAJOR_VERSION < 3
-            PyString_Check(name) &&
+            likely(PyString_Check(name)) &&
            PyString_AS_STRING(name)[0] == '_')
 #else
-            PyUnicode_Check(name) &&
+            likely(PyUnicode_Check(name)) &&
+            likely(__Pyx_PyUnicode_GET_LENGTH(name)) &&
            __Pyx_PyUnicode_READ_CHAR(name, 0) == '_')
 #endif
        {