◐ Shell
reader mode source ↗
Skip to content

gh-126220: Fix crash on calls to _lsprof.Profiler methods with 0 args (backportable)#126271

Merged
sobolevn merged 3 commits into
python:mainfrom
sobolevn:issue-126220-2
Nov 1, 2024
Merged

gh-126220: Fix crash on calls to _lsprof.Profiler methods with 0 args (backportable)#126271
sobolevn merged 3 commits into
python:mainfrom
sobolevn:issue-126220-2

Conversation

@sobolevn

@sobolevn sobolevn commented Nov 1, 2024 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

This is the fix with no AC that we can backport.

#126233 will be reworked to only apply AC to already fixed functions. I plan to merge this one first and then rebase the oirginal one.

@sobolevn sobolevn added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Nov 1, 2024
@bedevere-app bedevere-app Bot mentioned this pull request Nov 1, 2024
Closed
@picnixz picnixz changed the title gh-126220: Fix crash on calls to _lsprof.Profiler methods with 0 args Nov 1, 2024
@picnixz

picnixz commented Nov 1, 2024

Copy link
Copy Markdown
Member

I'm changing the title of the PR just so that we don't have two PRs that look exactly the same on the issue.

erlend-aasland
erlend-aasland approved these changes Nov 1, 2024
View reviewed changes

@erlend-aasland erlend-aasland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hide comment

(BTW, PyErr_Format always returns NULL)

@sobolevn sobolevn merged commit 28b148f into python:main Nov 1, 2024
@miss-islington-app

This comment was marked as outdated.

Sign in to view
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 1, 2024
@sobolevn @erlend-aasland @miss-islington
pythongh-126220: Fix crash on calls to _lsprof.Profiler methods wit… …
144447c 
…h 0 args (backportable) (pythonGH-126271)

(cherry picked from commit 28b148f)

Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 1, 2024
@sobolevn @erlend-aasland @miss-islington
pythongh-126220: Fix crash on calls to _lsprof.Profiler methods wit… …
4197d40 
…h 0 args (backportable) (pythonGH-126271)

(cherry picked from commit 28b148f)

Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
@bedevere-app

bedevere-app Bot commented Nov 1, 2024

Copy link
Copy Markdown

GH-126310 is a backport of this pull request to the 3.13 branch.

@bedevere-app

bedevere-app Bot commented Nov 1, 2024

Copy link
Copy Markdown

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

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Nov 1, 2024
@sobolevn

sobolevn commented Nov 1, 2024

Copy link
Copy Markdown
Member Author

Thank you! I will backport this change and go back to the original PR soon :)

@erlend-aasland

erlend-aasland commented Nov 1, 2024

Copy link
Copy Markdown
Contributor

I'm changing the title of the PR just so that we don't have two PRs that look exactly the same on the issue.

Next time, remember to edit such a change out of the squashed commit title ;)

@erlend-aasland

erlend-aasland commented Nov 1, 2024

Copy link
Copy Markdown
Contributor

Nit: ideally, the other PR would have received the title change (adapt to Argument Clinic ...), not this one.

sobolevn added a commit that referenced this pull request Nov 1, 2024
@miss-islington @sobolevn @erlend-aasland
[3.12] gh-126220: Fix crash on calls to _lsprof.Profiler methods wi… …
b5c19bd 
…th 0 args (backportable) (GH-126271) (#126311)

gh-126220: Fix crash on calls to `_lsprof.Profiler` methods with 0 args (backportable) (GH-126271)
(cherry picked from commit 28b148f)

Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
sobolevn added a commit that referenced this pull request Nov 1, 2024
@miss-islington @sobolevn @erlend-aasland
[3.13] gh-126220: Fix crash on calls to _lsprof.Profiler methods wi… …
1b9710c 
…th 0 args (backportable) (GH-126271) (#126310)

gh-126220: Fix crash on calls to `_lsprof.Profiler` methods with 0 args (backportable) (GH-126271)
(cherry picked from commit 28b148f)

Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
picnixz pushed a commit to picnixz/cpython that referenced this pull request Dec 8, 2024
@sobolevn @erlend-aasland @picnixz
pythongh-126220: Fix crash on calls to _lsprof.Profiler methods wit… …
590269e 
…h 0 args (backportable) (python#126271)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
ebonnal pushed a commit to ebonnal/cpython that referenced this pull request Jan 12, 2025
@sobolevn @erlend-aasland @ebonnal
pythongh-126220: Fix crash on calls to _lsprof.Profiler methods wit… …
8829f6d 
…h 0 args (backportable) (python#126271)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@erlend-aasland erlend-aasland erlend-aasland approved these changes

@gaogaotiantian gaogaotiantian

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sobolevn @picnixz @erlend-aasland