Skip to content

gh-105375: Improve _pickle error handling - #105475

Merged
erlend-aasland merged 7 commits into
python:mainfrom
erlend-aasland:improve-pickle-error-handling
Jun 9, 2023
Merged

gh-105375: Improve _pickle error handling#105475
erlend-aasland merged 7 commits into
python:mainfrom
erlend-aasland:improve-pickle-error-handling

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented Jun 7, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Error handling was deferred in some cases, which could potentially lead to exceptions being overwritten.

Issue:

@erlend-aasland
pythongh-105375: Improve _pickle error handling
9b514d5
Error handling was deferred in some cases, which could potentially lead
to exceptions being overwritten.
@erlend-aasland
Bail early from _Unpickler_SetInputStream() also
a91713a
@erlend-aaslanderlend-aasland added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Jun 7, 2023
@bedevere-botbedevere-bot mentioned this pull request Jun 7, 2023
Closed
18 tasks
@erlend-aasland

erlend-aasland commented Jun 7, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Slightly uncertain about commit a91713a, since it changes an exception message.

EDIT: I reverted it for now.

kumaraditya303
kumaraditya303 reviewed Jun 9, 2023
View reviewed changes
Comment threadModules/_pickle.c
@erlend-aasland
erlend-aasland merged commit 89aac6f into python:mainJun 9, 2023
@miss-islington

miss-islington commented Jun 9, 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.
🐍🍒⛏🤖

@erlend-aasland
erlend-aasland deleted the improve-pickle-error-handling branch June 9, 2023 17:09
@miss-islington

miss-islington commented Jun 9, 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 89aac6f6b7b3af046ec137121c90732289e79efc 3.12

@miss-islington

miss-islington commented Jun 9, 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 89aac6f6b7b3af046ec137121c90732289e79efc 3.11

erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Jun 9, 2023
@erlend-aasland
[3.11]pythongh-105375: Improve _pickle error handling (python#105475)
d5a8288
(cherry picked from commit 89aac6f)
Error handling was deferred in some cases, which could potentially lead
to exceptions being overwritten.
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-bot

bedevere-bot commented Jun 9, 2023

Copy link
Copy Markdown

GH-105583 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 9, 2023
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Jun 9, 2023
@erlend-aasland
[3.12]pythongh-105375: Improve _pickle error handling (python#105475)
78dc9de
(cherry picked from commit 89aac6f)
Error handling was deferred in some cases, which could potentially lead
to exceptions being overwritten.
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-bot

bedevere-bot commented Jun 9, 2023

Copy link
Copy Markdown

GH-105584 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 9, 2023
erlend-aasland added a commit that referenced this pull request Jun 9, 2023
@erlend-aasland
[3.11]gh-105375: Improve _pickle error handling (#105475) (#105583)
4d4251d
(cherry picked from commit 89aac6f)
Error handling was deferred in some cases, which could potentially lead
to exceptions being overwritten.
erlend-aasland added a commit that referenced this pull request Jun 9, 2023
@erlend-aasland
[3.12]gh-105375: Improve _pickle error handling (#105475) (#105584)
04b76ec
(cherry picked from commit 89aac6f)
Error handling was deferred in some cases, which could potentially lead
to exceptions being overwritten.
@erlend-aaslanderlend-aasland linked an issue Jun 9, 2023 that may be closed by this pull request
Incorrect error handling for APIs that can raise exceptions #105375
Closed
18 tasks
serhiy-storchaka
serhiy-storchaka reviewed Jun 12, 2023
View reviewed changes

@serhiy-storchakaserhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this introduced more dangerous bugs in constructors.

Comment threadModules/_pickle.c
Comment threadModules/_pickle.c
Comment threadModules/_pickle.c
erlend-aasland pushed a commit that referenced this pull request Aug 27, 2023
@salty-horse
gh-108542: Fix incorrect module name in NEWS entry forgh-105475(#10…
a429eaf
…8543)
erlend-aasland added a commit to erlend-aasland/cpython that referenced this pull request Aug 27, 2023
@erlend-aasland
[3.12]pythongh-108542: Fix incorrect module name in NEWS entry forp…
9875beb
…ythongh-105475 (python#108543)
(cherry picked from commit a429eaf)
erlend-aasland added a commit that referenced this pull request Aug 27, 2023
@erlend-aasland
[3.11]gh-108542: Fix incorrect module name in NEWS entry forgh-105475…
73f89b1
… (#108543) (#108544)
(cherry picked from commit a429eaf)
Yhg1s pushed a commit that referenced this pull request Aug 27, 2023
@erlend-aasland
[3.12]gh-108542: Fix incorrect module name in NEWS entry forgh-105475…
32d48ed
… (#108543) (#108545)
(cherry picked from commit a429eaf)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@encukouencukouencukou left review comments
@serhiy-storchakaserhiy-storchakaserhiy-storchaka left review comments
@kumaraditya303kumaraditya303Awaiting requested review from kumaraditya303

Assignees

@erlend-aaslanderlend-aasland

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Incorrect error handling for APIs that can raise exceptions

6 participants

@erlend-aasland@miss-islington@bedevere-bot@encukou@serhiy-storchaka@kumaraditya303