Skip to content
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

BUG: protect against accessing base attribute of a NULL subarray #19353

Merged
merged 4 commits into from
Jun 25, 2021
Merged

BUG: protect against accessing base attribute of a NULL subarray #19353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be8898c
BUG: protect against access an attribute of a NULL pointer
grlee77 Jun 24, 2021
6c4e3a9
pass descriptor rather than null
grlee77 Jun 24, 2021
4f56383
TST: test can_cast when only one argument has a subarray
grlee77 Jun 24, 2021
807020c
TST: test both argument orders
grlee77 Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions numpy/core/src/multiarray/convert_datatype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3293,8 +3293,10 @@ void_to_void_resolve_descriptors(
casting = NPY_NO_CASTING | _NPY_CAST_IS_VIEW;
}
}
NPY_CASTING field_casting = PyArray_GetCastSafety(
given_descrs[0]->subarray->base, given_descrs[1]->subarray->base, NULL);

PyArray_Descr *from_base = (from_sub == NULL) ? given_descrs[0] : from_sub->base;
PyArray_Descr *to_base = (to_sub == NULL) ? given_descrs[1] : to_sub->base;
NPY_CASTING field_casting = PyArray_GetCastSafety(from_base, to_base, NULL);
if (field_casting < 0) {
return -1;
}
Expand Down
8 changes: 8 additions & 0 deletions numpy/core/tests/test_casting_unittests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,3 +646,11 @@ def test_object_to_parametric_internal_error(self):
with pytest.raises(TypeError,
match="casting from object to the parametric DType"):
cast._resolve_descriptors((np.dtype("O"), None))

@pytest.mark.parametrize("casting", ["no", "unsafe"])
def test_void_and_structured_with_subarray(self, casting):
# test case corresponding to gh-19325
dtype = np.dtype([("foo", "<f4", (3, 2))])
expected = casting == "unsafe"
assert np.can_cast("V4", dtype, casting=casting) == expected
assert np.can_cast(dtype, "V4", casting=casting) == expected