Fix PyUnicode_GetSize(): Don't replace _PyUnicode_Ready() exception

rjmcnamara · Jun 16, 2012 · 0762133 · 0762133
1 parent 8a8b3ea
commit 0762133
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -3995,11 +3995,12 @@ PyUnicode_GetSize(PyObject *unicode)
 Py_ssize_t
 PyUnicode_GetLength(PyObject *unicode)
 {
-    if (!PyUnicode_Check(unicode) || PyUnicode_READY(unicode) == -1) {
+    if (!PyUnicode_Check(unicode)) {
         PyErr_BadArgument();
         return -1;
     }
-
+    if (PyUnicode_READY(unicode) == -1)
+        return -1;
     return PyUnicode_GET_LENGTH(unicode);
 }