diff --git a/Misc/NEWS b/Misc/NEWS index c17d77033b4..638d8e762c4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -4,6 +4,17 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.5.5c2? +============================= + +*Release date: xx-xxx-2010* + +Extension Modules +----------------- + +- Fix DoS via XML document with malformed UTF-8 sequences (CVE_2009_3560). + + What's New in Python 2.5.5c1? ============================= diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c index e04426d0cc1..105958b6496 100644 --- a/Modules/expat/xmlparse.c +++ b/Modules/expat/xmlparse.c @@ -3682,6 +3682,9 @@ doProlog(XML_Parser parser, return XML_ERROR_UNCLOSED_TOKEN; case XML_TOK_PARTIAL_CHAR: return XML_ERROR_PARTIAL_CHAR; + case -XML_TOK_PROLOG_S: + tok = -tok; + break; case XML_TOK_NONE: #ifdef XML_DTD /* for internal PE NOT referenced between declarations */