Skip to content

gh-101765: Fix refcount issues in list and unicode pickling#102265

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
Merged
JelleZijlstra merged 1 commit into from
Feb 26, 2023
Merged

gh-101765: Fix refcount issues in list and unicode pickling #102265

JelleZijlstra merged 1 commit into from
Feb 26, 2023

Conversation

@JelleZijlstra
Copy link
Member

@JelleZijlstraJelleZijlstra commented Feb 25, 2023•
edited by bedevere-bot
Loading

@JelleZijlstraJelleZijlstra added skip news 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section labels Feb 25, 2023
@bedevere-bot
Copy link

bedevere-bot commented Feb 25, 2023

🤖 New build scheduled with the buildbot fleet by @JelleZijlstra for commit b8ad59e 🤖

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

@bedevere-botbedevere-bot added awaiting core review and removed 🔨 test-with-refleak-buildbots Test PR w/ refleak buildbots; report in status section labels Feb 25, 2023
@bedevere-botbedevere-bot mentioned this pull request Feb 25, 2023
Closed
iritkatriel
iritkatriel approved these changes Feb 26, 2023
View reviewed changes
Copy link
Member

@iritkatrieliritkatriel left a comment

Choose a reason for hiding this comment

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

LGTM

@JelleZijlstraJelleZijlstra added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Feb 26, 2023
@JelleZijlstraJelleZijlstra merged commit d71edbd into python:mainFeb 26, 2023
@miss-islington
Copy link
Contributor

miss-islington commented Feb 26, 2023

Thanks @JelleZijlstra for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@JelleZijlstraJelleZijlstra deleted the refcount branch February 26, 2023 00:02
@miss-islington
Copy link
Contributor

miss-islington commented Feb 26, 2023

Sorry, @JelleZijlstra, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker d71edbd1b7437706519a9786211597d95934331a 3.11

@miss-islington
Copy link
Contributor

miss-islington commented Feb 26, 2023

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

@JelleZijlstra
Copy link
MemberAuthor

JelleZijlstra commented Feb 26, 2023

Working on the backports

@bedevere-bot
Copy link

bedevere-bot commented Feb 26, 2023

GH-102268 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 Feb 26, 2023
JelleZijlstra added a commit to JelleZijlstra/cpython that referenced this pull request Feb 26, 2023
@JelleZijlstra
[3.11]pythongh-101765: Fix refcount issues in list and unicode pickl…
e97ddc6
…ing (pythonGH-102265) Followup from pythonGH-101769.. (cherry picked from commit d71edbd) Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
@bedevere-bot
Copy link

bedevere-bot commented Feb 26, 2023

GH-102269 is a backport of this pull request to the 3.10 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.10 only security fixes label Feb 26, 2023
JelleZijlstra added a commit to JelleZijlstra/cpython that referenced this pull request Feb 26, 2023
@JelleZijlstra
[3.10]pythongh-101765: Fix refcount issues in list and unicode pickl…
fca504e
…ing (pythonGH-102265) Followup from pythonGH-101769.. (cherry picked from commit d71edbd) Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
JelleZijlstra added a commit that referenced this pull request Feb 26, 2023
@JelleZijlstra
[3.10]gh-101765: Fix refcount issues in list and unicode pickling (G…
6fa6c2a
…H-102265) (#102269) (cherry picked from commit d71edbd)
JelleZijlstra added a commit that referenced this pull request Feb 26, 2023
@JelleZijlstra
[3.11]gh-101765: Fix refcount issues in list and unicode pickling (G…
b36c498
…H-102265) (#102268) (cherry picked from commit d71edbd)
kumaraditya303
kumaraditya303 reviewed Feb 26, 2023
View reviewed changes
Objects/unicodeobject.c
PyObject*u=unicode_new_empty();
if (u==NULL)
if (u==NULL){
Py_DECREF(iter);
Copy link
Contributor

@kumaraditya303kumaraditya303Feb 26, 2023

Choose a reason for hiding this comment

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

Shouldn't this be Py_XDECREF? There is no null check above for iter.

Copy link
Member

@iritkatrieliritkatrielFeb 26, 2023

Choose a reason for hiding this comment

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

Good point. But shouldn’t it be a null check and return above, if iter is null I think it would crash in the BuildValue before we even get here.

Copy link
MemberAuthor

@JelleZijlstraJelleZijlstraFeb 26, 2023

Choose a reason for hiding this comment

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

Py_BuildValue deals with NULL internally; if one of the args is NULL it itself returns NULL, propagating the exception. So changing to XDECREF here should be enough.

Copy link
MemberAuthor

@JelleZijlstraJelleZijlstraFeb 26, 2023

Choose a reason for hiding this comment

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

#102283

@JelleZijlstraJelleZijlstra mentioned this pull request Feb 26, 2023
Merged
@ericsnowcurrentlyericsnowcurrently mentioned this pull request Feb 27, 2023
Merged
@JelleZijlstraJelleZijlstra restored the refcount branch September 10, 2024 23:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iritkatrieliritkatrieliritkatriel approved these changes

@kumaraditya303kumaraditya303kumaraditya303 left review comments

Assignees

@JelleZijlstraJelleZijlstra

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@JelleZijlstra@bedevere-bot@miss-islington@iritkatriel@kumaraditya303