Skip to content

[3.12] gh-90949: add Expat API to prevent XML deadly allocations (CVE-2025-59375) (GH-139234) #139527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yhg1s merged 9 commits into from
Dec 17, 2025
Merged

[3.12] gh-90949: add Expat API to prevent XML deadly allocations (CVE-2025-59375) (GH-139234) #139527

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aeefb63
[3.12] gh-90949: add Expat API to prevent XML deadly allocations (CVE…
picnixz Sep 26, 2025
a5d026a
gh-90949: amend GH-139234 in prevision of future mitigation API (#139…
picnixz Sep 26, 2025
2ab3e1d
Make use of macro _Py_ID possible to pyexpat
hartwork Oct 2, 2025
ce64f57
Add a temporary workaround for issue 139400
hartwork Oct 2, 2025
56896ae
Add an empty commit to see how temporary the RTD CI fail is
hartwork Oct 3, 2025
6e97592
Revert introduction of stddef.h import
hartwork Oct 3, 2025
bcab187
Merge remote-tracking branch 'upstream/3.12' into backport-f04bea4-3.12
hartwork Oct 7, 2025
932d28d
Drop workaround for 139400 as no-longer-needed
hartwork Oct 7, 2025
e49766f
Merge remote-tracking branch 'upstream/3.12' into backport-f04bea4-3.12
hartwork Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a temporary workaround for issue 139400
  • Loading branch information
@hartwork
hartwork committed Oct 2, 2025
commit ce64f570fcc9a2a575d07108a08d76694abd5dde
18 changes: 18 additions & 0 deletions Lib/test/test_pyexpat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,15 @@ def test_set_activation_threshold__fail_for_subparser(self):
setter = functools.partial(self.set_activation_threshold, subparser)
self.assert_root_parser_failure(setter, 12345)

# NOTE: This is a workaround for issue
# https://github.com/python/cpython/issues/139400
# that can be dropped once pull request
# https://github.com/python/cpython/pull/139403
# has been merged.
del setter
del subparser
del parser

@abc.abstractmethod
def test_set_maximum_amplification__amplification_exceeded(self):
"""Test when the amplification factor is exceeded."""
Expand Down Expand Up @@ -948,6 +957,15 @@ def test_set_maximum_amplification__fail_for_subparser(self):
setter = functools.partial(self.set_maximum_amplification, subparser)
self.assert_root_parser_failure(setter, 123.45)

# NOTE: This is a workaround for issue
# https://github.com/python/cpython/issues/139400
# that can be dropped once pull request
# https://github.com/python/cpython/pull/139403
# has been merged.
del setter
del subparser
del parser


@unittest.skipIf(expat.version_info < (2, 7, 2), "requires Expat >= 2.7.2")
class MemoryProtectionTest(AttackProtectionTestBase, unittest.TestCase):
Expand Down
Loading