_PyUnicode_CheckConsistency() ensures that the unicode string ends with a

vstinner · vstinner · commit 718fbf078cef · 2012-04-26T00:39:37.000+02:00
null character
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -375,10 +375,13 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
     {
         Py_ssize_t i;
         Py_UCS4 maxchar = 0;
-        void *data = PyUnicode_DATA(ascii);
+        void *data;
+        Py_UCS4 ch;
+
+        data = PyUnicode_DATA(ascii);
         for (i=0; i < ascii->length; i++)
         {
-            Py_UCS4 ch = PyUnicode_READ(kind, data, i);
+            ch = PyUnicode_READ(kind, data, i);
             if (ch > maxchar)
                 maxchar = ch;
         }
@@ -398,6 +401,7 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
             assert(maxchar >= 0x10000);
             assert(maxchar <= MAX_UNICODE);
         }
+        assert(PyUnicode_READ(kind, data, ascii->length) == 0);
     }
     return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -375,10 +375,13 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)`
`375`	`375`	`{`
`376`	`376`	`Py_ssize_t i;`
`377`	`377`	`Py_UCS4 maxchar = 0;`
`378`		`- void *data = PyUnicode_DATA(ascii);`
	`378`	`+ void *data;`
	`379`	`+ Py_UCS4 ch;`
	`380`	`+`
	`381`	`+ data = PyUnicode_DATA(ascii);`
`379`	`382`	`for (i=0; i < ascii->length; i++)`
`380`	`383`	`{`
`381`		`- Py_UCS4 ch = PyUnicode_READ(kind, data, i);`
	`384`	`+ ch = PyUnicode_READ(kind, data, i);`
`382`	`385`	`if (ch > maxchar)`
`383`	`386`	`maxchar = ch;`
`384`	`387`	`}`
`@@ -398,6 +401,7 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)`
`398`	`401`	`assert(maxchar >= 0x10000);`
`399`	`402`	`assert(maxchar <= MAX_UNICODE);`
`400`	`403`	`}`
	`404`	`+ assert(PyUnicode_READ(kind, data, ascii->length) == 0);`
`401`	`405`	`}`
`402`	`406`	`return 1;`
`403`	`407`	`}`