summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-09-17 11:28:09 (GMT)
committerGeorg Brandl <georg@python.org>2009-09-17 11:28:09 (GMT)
commite9741f3ed8487da1d7c8ac8b0c04d3f09802fb1a (patch)
tree7abc5212bc70ad2f5a217a038681cae4fd71d9d4 /Objects
parentbc3777d85e9f73bb8e541faf91103fb2374628a3 (diff)
downloadcpython-e9741f3ed8487da1d7c8ac8b0c04d3f09802fb1a.zip
cpython-e9741f3ed8487da1d7c8ac8b0c04d3f09802fb1a.tar.gz
cpython-e9741f3ed8487da1d7c8ac8b0c04d3f09802fb1a.tar.bz2
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".
Diffstat (limited to 'Objects')
-rw-r--r--Objects/unicodeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index c4b4902..6164510 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2321,7 +2321,7 @@ PyUnicode_DecodeUTF32Stateful(const char *s,
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;
}