gh-134411: assert PyLong_FromLong(x) != NULL when x is known to be small
#134415
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
PyLong_FromLong sets an exception when it fails, so the call to PyObject_SetAttrString is unsafe. We should return NULL instead of switching to Py_XDECREF.
But, as @sergey-miryanov mentioned, this can't fail for integers <255. I think it's also reasonable to add an assertion here instead of adding error handling.
…case and can't return NULL. Added assert for extra confidence. python#134411 (comment)
ZeroIntensity
added
skip news
needs backport to 3.13
ZeroIntensity
approved these changes
May 21, 2025
Python/instrumentation.c
Outdated
| @@ -2558,18 +2558,22 @@ PyObject *_Py_CreateMonitoringObject(void) | |||
| err = PyObject_SetAttrString(events, "NO_EVENTS", _PyLong_GetZero()); | |||
| if (err) goto error; | |||
| PyObject *val = PyLong_FromLong(PY_MONITORING_DEBUGGER_ID); | |||
| assert(val != NULL); | |||
There was a problem hiding this comment.
I think it'd be a good idea to add a comment explaining why it can't ever fail.
There was a problem hiding this comment.
I'll add it tomorrow.
picnixz
changed the title
PyLong_FromLong(x) != NULL when x is known to be small
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jul 21, 2025
…n to be small (pythonGH-134415) Since `PyLong_From Long(PY_MONITORING_DEBUGGER_ID)` falls to `small_int` case and can't return `NULL`. Added `assert`s for extra confidence. python#134411 (comment) (cherry picked from commit cf19b64) Co-authored-by: Sergey Muraviov <smurav@mail.ru>
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jul 21, 2025
…n to be small (pythonGH-134415) Since `PyLong_From Long(PY_MONITORING_DEBUGGER_ID)` falls to `small_int` case and can't return `NULL`. Added `assert`s for extra confidence. python#134411 (comment) (cherry picked from commit cf19b64) Co-authored-by: Sergey Muraviov <smurav@mail.ru>
|
GH-136910 is a backport of this pull request to the 3.14 branch. |
|
GH-136911 is a backport of this pull request to the 3.13 branch. |
sobolevn
pushed a commit
that referenced
this pull request
Jul 21, 2025
…wn to be small (GH-134415) (#136911) gh-134411: assert `PyLong_FromLong(x) != NULL` when `x` is known to be small (GH-134415) Since `PyLong_From Long(PY_MONITORING_DEBUGGER_ID)` falls to `small_int` case and can't return `NULL`. Added `assert`s for extra confidence. #134411 (comment) (cherry picked from commit cf19b64) Co-authored-by: Sergey Muraviov <smurav@mail.ru>
sobolevn
pushed a commit
that referenced
this pull request
Jul 21, 2025
…wn to be small (GH-134415) (#136910) gh-134411: assert `PyLong_FromLong(x) != NULL` when `x` is known to be small (GH-134415) Since `PyLong_From Long(PY_MONITORING_DEBUGGER_ID)` falls to `small_int` case and can't return `NULL`. Added `assert`s for extra confidence. #134411 (comment) (cherry picked from commit cf19b64) Co-authored-by: Sergey Muraviov <smurav@mail.ru>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Python/instrumentation.c: ensure non-NULLPyLong_FromLongresults when possible #134411