Merged revisions 74869 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74869 | georg.brandl | 2009-09-17 13:28:09 +0200 (Do, 17 Sep 2009) | 4 lines
Issue #6922: Fix an infinite loop when trying to decode an invalid
UTF-32 stream with a non-raising error handler like "replace" or "ignore".
........
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index e4f27e6..dbb2b49 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2207,7 +2207,7 @@
if (unicode_decode_call_errorhandler(
errors, &errorHandler,
"utf32", errmsg,
- starts, size, &startinpos, &endinpos, &exc, &s,
+ starts, size, &startinpos, &endinpos, &exc, (const char **)&q,
&unicode, &outpos, &p))
goto onError;
}