Issue #16847: Fixed improper use of _PyUnicode_CheckConsistency() in

tiran · tiran · commit 75e923fcf2da · 2013-01-03T09:22:41.000+01:00
non-pydebug builds. Several extension modules now compile cleanly when
assert()s are enabled in standard builds (-DDEBUG flag).
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -4501,6 +4501,10 @@ Tools/Demos
 Extension Modules
 -----------------
 
+- Issue #16847: Fixed improper use of _PyUnicode_CheckConsistency() in
+  non-pydebug builds. Several extension modules now compile cleanly when
+  assert()s are enabled in standard builds (-DDEBUG flag).
+
 - Issue #13840: The error message produced by ctypes.create_string_buffer
   when given a Unicode string has been fixed.
 
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -210,7 +210,9 @@ ascii_escape_unicode(PyObject *pystr)
         }
     }
     output[chars++] = '"';
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(rval, 1));
+#endif
     return rval;
 }
 
diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
@@ -300,7 +300,9 @@ SHA3_hexdigest(SHA3object *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
 
diff --git a/Modules/md5module.c b/Modules/md5module.c
@@ -399,7 +399,9 @@ MD5_hexdigest(MD5object *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
 
diff --git a/Modules/sha1module.c b/Modules/sha1module.c
@@ -376,7 +376,9 @@ SHA1_hexdigest(SHA1object *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
 
diff --git a/Modules/sha256module.c b/Modules/sha256module.c
@@ -456,7 +456,9 @@ SHA256_hexdigest(SHAobject *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
 
diff --git a/Modules/sha512module.c b/Modules/sha512module.c
@@ -522,7 +522,9 @@ SHA512_hexdigest(SHAobject *self, PyObject *unused)
         c = (digest[i] & 0xf);
         hex_digest[j++] = Py_hexdigits[c];
     }
+#ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(retval, 1));
+#endif
     return retval;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,9 @@ ascii_escape_unicode(PyObject *pystr)`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`	`output[chars++] = '"';`
	`213`	`+#ifdef Py_DEBUG`
`213`	`214`	`assert(_PyUnicode_CheckConsistency(rval, 1));`
	`215`	`+#endif`
`214`	`216`	`return rval;`
`215`	`217`	`}`
`216`	`218`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,9 @@ SHA3_hexdigest(SHA3object self, PyObject unused)`
`300`	`300`	`c = (digest[i] & 0xf);`
`301`	`301`	`hex_digest[j++] = Py_hexdigits[c];`
`302`	`302`	`}`
	`303`	`+#ifdef Py_DEBUG`
`303`	`304`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`305`	`+#endif`
`304`	`306`	`return retval;`
`305`	`307`	`}`
`306`	`308`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,9 @@ MD5_hexdigest(MD5object self, PyObject unused)`
`399`	`399`	`c = (digest[i] & 0xf);`
`400`	`400`	`hex_digest[j++] = Py_hexdigits[c];`
`401`	`401`	`}`
	`402`	`+#ifdef Py_DEBUG`
`402`	`403`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`404`	`+#endif`
`403`	`405`	`return retval;`
`404`	`406`	`}`
`405`	`407`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,9 @@ SHA1_hexdigest(SHA1object self, PyObject unused)`
`376`	`376`	`c = (digest[i] & 0xf);`
`377`	`377`	`hex_digest[j++] = Py_hexdigits[c];`
`378`	`378`	`}`
	`379`	`+#ifdef Py_DEBUG`
`379`	`380`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`381`	`+#endif`
`380`	`382`	`return retval;`
`381`	`383`	`}`
`382`	`384`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,9 @@ SHA256_hexdigest(SHAobject self, PyObject unused)`
`456`	`456`	`c = (digest[i] & 0xf);`
`457`	`457`	`hex_digest[j++] = Py_hexdigits[c];`
`458`	`458`	`}`
	`459`	`+#ifdef Py_DEBUG`
`459`	`460`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`461`	`+#endif`
`460`	`462`	`return retval;`
`461`	`463`	`}`
`462`	`464`
Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,9 @@ SHA512_hexdigest(SHAobject self, PyObject unused)`
`522`	`522`	`c = (digest[i] & 0xf);`
`523`	`523`	`hex_digest[j++] = Py_hexdigits[c];`
`524`	`524`	`}`
	`525`	`+#ifdef Py_DEBUG`
`525`	`526`	`assert(_PyUnicode_CheckConsistency(retval, 1));`
	`527`	`+#endif`
`526`	`528`	`return retval;`
`527`	`529`	`}`
`528`	`530`