commit e1335c711c555567a9951dd5c1dfde85545445d4
author Victor Stinner <victor.stinner@haypocalc.com> Tue Oct 04 20:53:03 2011 +0200
committer Victor Stinner <victor.stinner@haypocalc.com> Tue Oct 04 20:53:03 2011 +0200
tree ce073dc242b4399ed8bcc67062d7896fb717908d
parent e06e145943854d398adfe053cec757e269af0631

Fix usage og PyUnicode_READY()

Python/getargs.c

diff --git a/Python/getargs.c b/Python/getargs.c
index 0e7d9c4..2c2db36 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -834,14 +834,21 @@
 
     case 'C': {/* unicode char */
         int *p = va_arg(*p_va, int *);
-        if (PyUnicode_Check(arg) &&
-            PyUnicode_GET_LENGTH(arg) == 1) {
-            int kind = PyUnicode_KIND(arg);
-            void *data = PyUnicode_DATA(arg);
-            *p = PyUnicode_READ(kind, data, 0);
-        }
-        else
+        int kind;
+        void *data;
+
+        if (!PyUnicode_Check(arg))
             return converterr("a unicode character", arg, msgbuf, bufsize);
+
+        if (PyUnicode_READY(arg))
+            RETURN_ERR_OCCURRED;
+
+        if (PyUnicode_GET_LENGTH(arg) != 1)
+            return converterr("a unicode character", arg, msgbuf, bufsize);
+
+        kind = PyUnicode_KIND(arg);
+        data = PyUnicode_DATA(arg);
+        *p = PyUnicode_READ(kind, data, 0);
         break;
     }