BUG: Fix out-of-bounds access in safe_sort with an empty array and non-empty codes #59489
+21
−11
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
Previously we masked `codes` referring to out-of-bounds elements to 0 and then fixed them after to -1 using `np.putmask`. However, this results in out-of-bounds access in `take_nd` if the array is empty. Instead, set all out-of-bounds indices in `codes` to -1 immediately, as these can be handled by `take_nd`.
`use_na_sentinel` cannot be truthy inside an else branch where it is falsy.
3 tasks
mroeschke
requested changes
Aug 12, 2024
There was a problem hiding this comment.
Could you also add a unit test for your original example in #59421 (comment)?
Done. I also verified that with bounds checking enabled on |
mroeschke
approved these changes
Aug 12, 2024
|
Thanks @jsspencer |
shreyas-dev
pushed a commit
to shreyas-dev/pandas
that referenced
this pull request
Aug 13, 2024
…n-empty codes (pandas-dev#59489) * Fix out-of-bounds violations in safe_sort for empty arrays. Previously we masked `codes` referring to out-of-bounds elements to 0 and then fixed them after to -1 using `np.putmask`. However, this results in out-of-bounds access in `take_nd` if the array is empty. Instead, set all out-of-bounds indices in `codes` to -1 immediately, as these can be handled by `take_nd`. * Remove dead code. `use_na_sentinel` cannot be truthy inside an else branch where it is falsy. * Add test based upon pandas-dev#59421
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.
safe_sortcould handle out-of-bounds references incodesso long as the array was not empty.By masking all out-of-bounds values to -1, we can handle both empty and non-empty array cases.
Previously we masked out-of-bounds values to 0 and then fixed them up afterwards, but this results in accessing the 0th element which doesn't exist in the empty array case.
safe_sort#59421doc/source/whatsnew/vX.X.X.rstfile if fixing a bug or adding a new feature.