8000 BUG: Fix segfault in np.random.shuffle for arrays of different length strings by simongibbons · Pull Request #7719 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Fix segfault in np.random.shuffle for arrays of different length strings #7719

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

Merged
merged 1 commit into from
Jun 10, 2016
Merged

BUG: Fix segfault in np.random.shuffle for arrays of different length strings #7719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 1 deletion numpy/random/mtrand/mtrand.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5064,7 +5064,11 @@ cdef class RandomState:
x_ptr = <char*><size_t>x.ctypes.data
stride = x.strides[0]
itemsize = x.dtype.itemsize
buf = np.empty_like(x[0]) # GC'd at function exit
# As the array x could contain python objects we use a buffer
# of bytes for the swaps to avoid leaving one of the objects
# within the buffer and erroneously decrementing it's refcount
# when the function exits.
buf = np.empty(itemsize, dtype=np.int8) # GC'd at function exit
buf_ptr = <char*><size_t>buf.ctypes.data
with self.lock:
# We trick gcc into providing a specialized implementation for
Expand Down
29 changes: 29 additions & 0 deletions numpy/random/tests/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,34 @@ def test_choice_sum_of_probs_tolerance(self):
assert_(c in a)
assert_raises(ValueError, np.random.choice, a, p=probs*0.9)

def test_shuffle_of_array_of_different_length_strings(self):
# Test that permuting an array of different length strings
# will not cause a segfault on garbage collection
# Tests gh-7710
np.random.seed(1234)

a = np.array(['a', 'a' * 1000])

for _ in range(100):
np.random.shuffle(a)

# Force Garbage Collection - should not segfault.
import gc
gc.collect()

def test_shuffle_of_array_of_objects(self):
# Test that permuting an array of objects will not cause
# a segfault on garbage collection.
# See gh-7719
np.random.seed(1234)
a = np.array([np.arange(1), np.arange(4)])

for _ in range(1000):
np.random.shuffle(a)

# Force Garbage Collection - should not segfault.
import gc
gc.collect()

if __name__ == "__main__":
run_module_suite()
0