From: Matthias Klose <doko@ubuntu.com>
Date: Fri, 22 Jan 2010 01:10:19 +0000 (+0000)
Subject: Merged revisions 77680 via svnmerge from
X-Git-Tag: v3.2a1~1817
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a50ffe5389d5a0f98a35dec1ce1a35b616706199;p=thirdparty%2FPython%2Fcpython.git

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 03cd7dff3270..f5275b8cc4d5 100644
--- 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 e04426d0cc15..105958b64965 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 */