PyUnicode_FromObject() ensures that its output is a ready string

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index a26fd2f68b649231010f60149054c529f0d743e6..fed2cc9fb4f0faa1518e2094b23d0f6f0a2ff8b7 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2068,6 +2068,8 @@ PyUnicode_FromObject(register PyObject *obj)
     /* XXX Perhaps we should make this API an alias of
        PyObject_Str() instead ?! */
     if (PyUnicode_CheckExact(obj)) {
+        if (PyUnicode_READY(obj))
+            return NULL;
         Py_INCREF(obj);
         return obj;
     }