diff --git a/Misc/NEWS b/Misc/NEWS index 638d8e762c4..ce333a5cb0f 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,7 +12,8 @@ What's New in Python 2.5.5c2? Extension Modules ----------------- -- Fix DoS via XML document with malformed UTF-8 sequences (CVE_2009_3560). +- expat: Fix DoS via XML document with malformed UTF-8 sequences (CVE_2009_3560). +- expat: Fix DoS via malformed XML (CVE-2009-3720). What's New in Python 2.5.5c1? diff --git a/Modules/expat/xmltok_impl.c b/Modules/expat/xmltok_impl.c index 0ee57abb1f4..f793a6b8c76 100644 --- a/Modules/expat/xmltok_impl.c +++ b/Modules/expat/xmltok_impl.c @@ -1741,7 +1741,7 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *end, POSITION *pos) { - while (ptr != end) { + while (ptr < end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \