Skip to content

gh-105375: Harden pyexpat initialisation - #105606

Merged
erlend-aasland merged 5 commits into
python:mainfrom
erlend-aasland:improve-pyexpat-error-handling
Jun 11, 2023
Merged

gh-105375: Harden pyexpat initialisation#105606
erlend-aasland merged 5 commits into
python:mainfrom
erlend-aasland:improve-pyexpat-error-handling

Conversation

@erlend-aasland

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

Copy link
Copy Markdown
Contributor

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-aaslanderlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Jun 9, 2023
@erlend-aaslanderlend-aasland mentioned this pull request Jun 9, 2023
Closed
18 tasks
@erlend-aaslanderlend-aasland changed the title gh-105605: Harden pyexpat initialisationgh-105375: Harden pyexpat initialisationJun 9, 2023
sobolevn
sobolevn reviewed Jun 10, 2023
View reviewed changes
Comment threadModules/pyexpat.c
Comment threadModules/pyexpat.c
@erlend-aaslanderlend-aasland added the 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section label Jun 11, 2023
@bedevere-bot

bedevere-bot commented Jun 11, 2023

Copy link
Copy Markdown

🤖 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-botbedevere-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:mainJun 11, 2023
@miss-islington

miss-islington commented Jun 11, 2023

Copy link
Copy Markdown
Contributor

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

@miss-islington

miss-islington commented Jun 11, 2023

Copy link
Copy Markdown
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

miss-islington commented Jun 11, 2023

Copy link
Copy Markdown
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-aaslanderlend-aasland added needs backport to 3.12 only security fixes and removed needs backport to 3.12 only security fixes labels Jun 11, 2023
@miss-islington

miss-islington commented Jun 11, 2023

Copy link
Copy Markdown
Contributor

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

@miss-islington

miss-islington commented Jun 11, 2023

Copy link
Copy Markdown
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

bedevere-bot commented Jun 11, 2023

Copy link
Copy Markdown

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

@bedevere-botbedevere-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

bedevere-bot commented Jun 11, 2023

Copy link
Copy Markdown

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

@bedevere-botbedevere-bot removed the needs backport to 3.12 only 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sobolevnsobolevnsobolevn left review comments

Assignees

@erlend-aaslanderlend-aasland

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@erlend-aasland@bedevere-bot@miss-islington@sobolevn