commit 07621338fb29444a7b2038da44f3cb57a328a7ce
author Victor Stinner <victor.stinner@gmail.com> Sat Jun 16 04:53:46 2012 +0200
committer Victor Stinner <victor.stinner@gmail.com> Sat Jun 16 04:53:46 2012 +0200
tree c5560f0f5d21721475259736a5439b5592db37fa
parent 8a8b3eaabe0a3cf2f4df1b23239dde33d5dd10c4

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

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index cf9aec2..267dae1 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3995,11 +3995,12 @@
 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);
 }