commit a50ffe5389d5a0f98a35dec1ce1a35b616706199
author Matthias Klose <doko@ubuntu.com> Fri Jan 22 01:10:19 2010 +0000
committer Matthias Klose <doko@ubuntu.com> Fri Jan 22 01:10:19 2010 +0000
tree 6c6a7501d5472d0f8f707171070b362d21a497cf
parent b660599fda5e848c2da5265f6f47177659c0da26

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).
........

Modules/expat/xmlparse.c

diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e04426d..105958b 100644
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -3682,6 +3682,9 @@
         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 */