mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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).
........
This commit is contained in:
Matthias Klose 2010-01-22 01:10:19 +00:00
parent b660599fda
commit a50ffe5389
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -610,6 +610,9 @@ Extension Modules
- Issue #2389: Array objects are now pickled in a portable manner. - 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 Build
----- -----

3
Modules/expat/xmlparse.c
View File

@ -3682,6 +3682,9 @@ doProlog(XML_Parser parser,
return XML_ERROR_UNCLOSED_TOKEN; return XML_ERROR_UNCLOSED_TOKEN;
case XML_TOK_PARTIAL_CHAR: case XML_TOK_PARTIAL_CHAR:
return XML_ERROR_PARTIAL_CHAR; return XML_ERROR_PARTIAL_CHAR;
case -XML_TOK_PROLOG_S:
tok = -tok;
break;
case XML_TOK_NONE: case XML_TOK_NONE:
#ifdef XML_DTD #ifdef XML_DTD
/* for internal PE NOT referenced between declarations */ /* for internal PE NOT referenced between declarations */