API,BUG: Fix scalar handling in array-interface allowing NULL pointers #29338
+84
−12
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
seberg
commented
Jul 8, 2025
| if (PyArray_SIZE(ret) > 1) { | ||
| PyErr_SetString(PyExc_ValueError, | ||
| "cannot coerce scalar to array with size > 1"); | ||
| Py_DECREF(ret); | ||
| goto fail; | ||
| } | ||
| if (PyArray_SETITEM(ret, PyArray_DATA(ret), origin) < 0) { | ||
| if (PyArray_Pack(PyArray_DESCR(ret), PyArray_DATA(ret), origin) < 0) { |
There was a problem hiding this comment.
This probably doesn't matter in practice, but could matter for new dtypes in principle. It's just the right way now.
seberg
commented
Jul 8, 2025
| return NULL; | ||
| } | ||
| else if (result == 1) { | ||
| Py_DECREF(iface); | ||
| Py_DECREF(attr); |
There was a problem hiding this comment.
This is a plain bug-fix, it could (and maybe should) be backported. In this branch attr is explicitly still NULL, since result == 0.
There was a problem hiding this comment.
I agree. This must have been a bug from the GetItemRef migration. Care to make a backport PR for this?
This fixes the scalar handling in the array-interface and also a bug in the shape handling error path. In theory it breaks code that used NULL to trigger the scalar path, but this path was: 1. Completely undocumented, and 2. correctly triggered by *ommitting* the data field instead. I didn't remove/deprecate the scalar path in this PR, maybe we should. But, I do think we can ignore that theoretical use-case since it is nonsensical. Signed-off-by: Sebastian Berg <sebastianb@nvidia.com>
9ec8b22 to
10af699
Compare
ngoldbaum
approved these changes
Jul 8, 2025
| return NULL; | ||
| } | ||
| else if (result == 1) { | ||
| Py_DECREF(iface); | ||
| Py_DECREF(attr); |
There was a problem hiding this comment.
I agree. This must have been a bug from the GetItemRef migration. Care to make a backport PR for this?
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.
This fixes the scalar handling in the array-interface and also a bug in the shape handling error path.
In theory it breaks code that used NULL to trigger the scalar path, but this path was:
I didn't remove/deprecate the scalar path in this PR, maybe we should. But, I do think we can ignore that theoretical use-case since it is nonsensical.
Closes gh-26037