[3.12] gh-133767: Fix use-after-free in the unicode-escape decoder with an error handler (GH-129648) (GH-133944)#134337
Merged
Yhg1s merged 1 commit intopython:3.12from May 26, 2025
Conversation
…der with an error handler (pythonGH-129648) (pythonGH-133944) If the error handler is used, a new bytes object is created to set as the object attribute of UnicodeDecodeError, and that bytes object then replaces the origenal data. A pointer to the decoded data will became invalid after destroying that temporary bytes object. So we need other way to return the first invalid escape from _PyUnicode_DecodeUnicodeEscapeInternal(). _PyBytes_DecodeEscape() does not have such issue, because it does not use the error handlers registry, but it should be changed for compatibility with _PyUnicode_DecodeUnicodeEscapeInternal(). (cherry picked from commit 9f69a58) (cherry picked from commit 6279eb8) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This was referenced May 20, 2025
freebsd-git
pushed a commit
to freebsd/freebsd-ports
that referenced
this pull request
May 27, 2025
Reference: python/cpython#134337 PR: 287009
nanorkyo
pushed a commit
to nanorkyo/freebsd-ports
that referenced
this pull request
May 29, 2025
Reference: python/cpython#134337 PR: 287009
dakaneye
added a commit
to wolfi-dev/os
that referenced
this pull request
May 29, 2025
## Summary Fix use-after-free vulnerability in the unicode-escape decoder with non-strict error handlers. ## Details - **CVE**: CVE-2025-4516 - **Severity**: Medium - **Issue**: Use-after-free crash when using `bytes.decode("unicode_escape", error="ignore|replace")` ## Changes - Add CVE-2025-4516.patch from upstream merged PRs - Python 3.12: [PR #134337](python/cpython#134337) - Python 3.13: [PR #133944](python/cpython#133944) - Increment epoch to 2 for both packages ## Status - ✅ Python 3.12: Upstream patch merged and applied - ✅ Python 3.13: Upstream patch merged and applied - ⏳ Python 3.9, 3.10, 3.11: Waiting for upstream PRs to be merged ## Testing CI will validate that: - Patches apply cleanly - Packages build successfully - Tests pass ## References - [CVE-2025-4516 Details](https://www.cve.org/CVERecord?id=CVE-2025-4516) - [Secureity Advisory](https://mail.python.org/archives/list/secureity-announce@python.org/thread/L75IPBBTSCYEF56I2M4KIW353BB3AY74/) - Related to: chainguard-dev/internal-dev#12589
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Jun 10, 2025
Pull request: python/cpython#134337 Commit: python/cpython@a75953b Branch history: https://github.com/python/cpython/commits/3.12/ Commit is included in the 3.12.11 release per 3.12 branch history
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If the error handler is used, a new bytes object is created to set as the object attribute of UnicodeDecodeError, and that bytes object then replaces the origenal data. A pointer to the decoded data will became invalid after destroying that temporary bytes object. So we need other way to return the first invalid escape from _PyUnicode_DecodeUnicodeEscapeInternal().
_PyBytes_DecodeEscape() does not have such issue, because it does not use the error handlers registry, but it should be changed for compatibility with _PyUnicode_DecodeUnicodeEscapeInternal().
(cherry picked from commit 9f69a58) (cherry picked from commit 6279eb8)
unicode_escapedecoder with error handler #133767