summaryrefslogtreecommitdiff
path: root/Modules/expat
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2010-01-22 00:39:04 +0000
committerMatthias Klose <doko@ubuntu.com>2010-01-22 00:39:04 +0000
commit0d948ac90cc92aa7724a20b47226bf2e512e30ab (patch)
tree31b238bd3c0c6db55a19a82a84e87ab94cec8c51 /Modules/expat
parent3b0f9b01f6e668a526faf01ce70d0fccd76e9f65 (diff)
downloadcpython-git-0d948ac90cc92aa7724a20b47226bf2e512e30ab.tar.gz
- Expat: Fix DoS via XML document with malformed UTF-8 sequences
(CVE_2009_3560).
Diffstat (limited to 'Modules/expat')
-rw-r--r--Modules/expat/xmlparse.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index e04426d0cc..105958b649 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 */