Skip to content

ARROW-8105: [Python] Fix segfault when shrunken masked array is passed to pyarrow.array #6612

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

Closed
nugend wants to merge 3 commits into from
Closed

ARROW-8105: [Python] Fix segfault when shrunken masked array is passed to pyarrow.array #6612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1f323c
ARROW-8105: [Python] Fix segfault when shrunken masked array is passe…
nugend Mar 13, 2020
ea9f56a
added missing newline for linter
nugend Mar 13, 2020
aa923d5
Fix type of masked array to int64
nugend Mar 17, 2020
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
3 changes: 2 additions & 1 deletion python/pyarrow/array.pxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ def array(object obj, type=None, mask=None, size=None, from_pandas=None,
raise ValueError("Cannot pass a numpy masked array and "
"specify a mask at the same time")
else:
mask = values.mask
# don't use shrunken masks
mask = None if values.mask is np.ma.nomask else values.mask
values = values.data

if hasattr(values, '__arrow_array__'):
Expand Down
7 changes: 7 additions & 0 deletions python/pyarrow/tests/test_array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,6 +1656,13 @@ def test_array_from_masked():
pa.array(ma, mask=np.array([True, False, False, False]))


def test_array_from_shrunken_masked():
ma = np.ma.array([0], dtype='int64')
result = pa.array(ma)
expected = pa.array([0], type='int64')
assert expected.equals(result)


def test_array_from_invalid_dim_raises():
msg = "only handle 1-dimensional arrays"
arr2d = np.array([[1, 2, 3], [4, 5, 6]])
Expand Down