]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
[3.9] gh-115398: Expose Expat >=2.6.0 reparse deferral API (CVE-2023-52425) (GH-11562...
authorSebastian Pipping <sebastian@pipping.org>
Wed, 6 Mar 2024 23:03:30 +0000 (00:03 +0100)
committerGitHub <noreply@github.com>
Wed, 6 Mar 2024 23:03:30 +0000 (00:03 +0100)
commit200762426b4b9878c33cdef620aa1a51631dd5df
treee4983a43dc9a152eaf65b7f3528808be2ca4ae5c
parent468ba95c797623ab4f4ff95ac342ded9e9a74e97
[3.9] gh-115398: Expose Expat >=2.6.0 reparse deferral API (CVE-2023-52425) (GH-115623) (GH-116272)

Allow controlling Expat >=2.6.0 reparse deferral (CVE-2023-52425) by adding five new methods:

- `xml.etree.ElementTree.XMLParser.flush`
- `xml.etree.ElementTree.XMLPullParser.flush`
- `xml.parsers.expat.xmlparser.GetReparseDeferralEnabled`
- `xml.parsers.expat.xmlparser.SetReparseDeferralEnabled`
- `xml.sax.expatreader.ExpatParser.flush`

Based on the "flush" idea from https://github.com/python/cpython/pull/115138#issuecomment-1932444270 .

Includes code suggested-by: Snild Dolkow <snild@sony.com>
and by core dev Serhiy Storchaka.

Co-authored-by: Gregory P. Smith <greg@krypto.org>
14 files changed:
Doc/library/pyexpat.rst
Doc/library/xml.etree.elementtree.rst
Include/pyexpat.h
Lib/test/test_pyexpat.py
Lib/test/test_sax.py
Lib/test/test_xml_etree.py
Lib/xml/etree/ElementTree.py
Lib/xml/sax/expatreader.py
Misc/NEWS.d/next/Security/2024-02-18-03-14-40.gh-issue-115398.tzvxH8.rst [new file with mode: 0644]
Modules/_elementtree.c
Modules/clinic/_elementtree.c.h
Modules/clinic/pyexpat.c.h
Modules/expat/pyexpatns.h
Modules/pyexpat.c