mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-11 19:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 77682 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77682 | matthias.klose | 2010-01-22 02:10:19 +0100 (Fr, 22 Jan 2010) | 10 lines

  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:13:15 +00:00
parent ea26c6c154
commit 865e33bb3d
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -272,6 +272,9 @@ Extension Modules
- Issue #6848: Fix curses module build failure on OS X 10.6. - Issue #6848: Fix curses module build failure on OS X 10.6.
- Expat: Fix DoS via XML document with malformed UTF-8 sequences
(CVE_2009_3560).
Tests Tests
----- -----

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 */