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

07621338 · Victor Stinner · 8a8b3eaa · 07621338
Commit 07621338 authored Jun 16, 2012 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Objects/unicodeobject.c Objects/unicodeobject.c +3 -2

No files found.
--- 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);
 }