Merged revisions 77680 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77680 | matthias.klose | 2010-01-22 01:39:04 +0100 (Fr, 22 Jan 2010) | 3 lines

  - Expat: Fix DoS via XML document with malformed UTF-8 sequences
    (CVE_2009_3560).
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 03cd7dff32706bdca5218996a3e7d5a44a34a99a..f5275b8cc4d55e6089478edcc4b5ed640472310e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -610,6 +610,9 @@ Extension Modules
 
 - Issue #2389: Array objects are now pickled in a portable manner.
 
+- Expat: Fix DoS via XML document with malformed UTF-8 sequences
+  (CVE_2009_3560).
+
 Build
 -----
 

diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e04426d0cc1591e5d45be5b0f0dcb335226af500..105958b64965463f510ef0ff6c4b57478bbcffb2 100644 (file)
--- 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 */