Skip to content
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

Jump to bottom

gh-105375: Harden pyexpat initialisation #105606

Merged
merged 5 commits into from
Jun 11, 2023
Merged

gh-105375: Harden pyexpat initialisation #105606

merged 5 commits into from
Jun 11, 2023

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Jun 9, 2023 •
edited by bedevere-bot

Add proper error handling to add_errors_module() to prevent exceptions
from possibly being overwritten, and objects from being decref'ed twice.

@erlend-aasland
pythongh-105605: Harden pyexpat initialisation
d6cf426 
Add proper error handling to add_errors_module() to prevent exceptions
from possibly being overwritten, and objects from being decref'ed twice.
@erlend-aasland erlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Jun 9, 2023
@erlend-aasland erlend-aasland mentioned this pull request Jun 9, 2023
Closed
18 tasks
@erlend-aasland erlend-aasland changed the title gh-105605: Harden pyexpat initialisation gh-105375: Harden pyexpat initialisation Jun 9, 2023
sobolevn
sobolevn reviewed Jun 10, 2023
View reviewed changes
Modules/pyexpat.c Show resolved Hide resolved
Modules/pyexpat.c Show resolved Hide resolved
@erlend-aasland erlend-aasland added the 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section label Jun 11, 2023
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @erlend-aasland for commit 143c3e3 🤖

If you want to schedule another build, you need to add the 🔨 test-with-refleak-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section label Jun 11, 2023
@erlend-aasland erlend-aasland enabled auto-merge (squash) June 11, 2023 19:55
@erlend-aasland erlend-aasland merged commit 20a56d8 into python:main Jun 11, 2023
21 checks passed
@miss-islington
Copy link
Contributor

Thanks @erlend-aasland for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry @erlend-aasland, I had trouble checking out the 3.12 backport branch.
Please retry by removing and re-adding the "needs backport to 3.12" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 20a56d8becba1a5a958b167fdb43b1a1b9228095 3.12

@miss-islington
Copy link
Contributor

Sorry, @erlend-aasland, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 20a56d8becba1a5a958b167fdb43b1a1b9228095 3.11

@erlend-aasland erlend-aasland deleted the improve-pyexpat-error-handling branch June 11, 2023 20:31
@erlend-aasland erlend-aasland added needs backport to 3.12 bug and security fixes and removed needs backport to 3.12 bug and security fixes labels Jun 11, 2023
@miss-islington
Copy link
Contributor

Thanks @erlend-aasland for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry @erlend-aasland, I had trouble checking out the 3.12 backport branch.
Please retry by removing and re-adding the "needs backport to 3.12" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 20a56d8becba1a5a958b167fdb43b1a1b9228095 3.12

erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Jun 11, 2023
@erlend-aasland
[3.11] pythongh-105375: Harden pyexpat initialisation (python#105606)
6cf1196 
(cherry picked from commit 20a56d8)

Add proper error handling to add_errors_module() to prevent exceptions
from possibly being overwritten.

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-bot
Copy link

GH-105668 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Jun 11, 2023
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Jun 11, 2023
@erlend-aasland
[3.12] pythongh-105375: Harden pyexpat initialisation (python#105606)
b49b056 
(cherry picked from commit 20a56d8)

Add proper error handling to add_errors_module() to prevent exceptions
from possibly being overwritten.

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-bot
Copy link

GH-105669 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jun 11, 2023
erlend-aasland added a commit that referenced this pull request Jun 11, 2023
@erlend-aasland
[3.11] gh-105375: Harden pyexpat initialisation (#105606) (#105668)
e5fe017 
(cherry picked from commit 20a56d8)

Add proper error handling to add_errors_module() to prevent exceptions
from possibly being overwritten.
erlend-aasland added a commit that referenced this pull request Jun 11, 2023
@erlend-aasland
[3.12] gh-105375: Harden pyexpat initialisation (#105606) (#105669)
d310fc7 
(cherry picked from commit 20a56d8)

Add proper error handling to add_errors_module() to prevent exceptions
from possibly being overwritten.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sobolevn sobolevn sobolevn left review comments

Assignees

@erlend-aasland erlend-aasland

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@erlend-aasland @bedevere-bot @miss-islington @sobolevn