]> granicus.if.org Git - python/commitdiff
Fix PyUnicode_GetSize(): Don't replace _PyUnicode_Ready() exception
authorVictor Stinner <victor.stinner@gmail.com>
Sat, 16 Jun 2012 02:53:46 +0000 (04:53 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Sat, 16 Jun 2012 02:53:46 +0000 (04:53 +0200)
Objects/unicodeobject.c

index cf9aec2b1f29314ae3d6d77b1f085b4412828f19..267dae1bc7a2d13612883e13543cca726c3f6a62 100644 (file)
@@ -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);
 }