-
-
Notifications
You must be signed in to change notification settings - Fork 9.5k
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.
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
BUG: Prevent VOID_copyswapn ignoring strides #8976
Conversation
Previously, this would cause a segfault in .sort. Fixes numpy#8210
LGTM once the implicit declaration problem is fixed. I've often thought it would be good if we actually declared all functions at the top of the file before gettin around to the definitions. |
3ce726f
to
6e03829
Compare
Fixed in a different way - having these functions call each other is a recipe for bugs if we end up modifying one and accidentally affecting the other. Better just to pull out some helper functions. I think this first commit alone should be enough to backport, if you want to not do so to |
@@ -1796,6 +1796,30 @@ BOOL_fromstr(char *str, void *ip, char **endptr, | |||
*/ | |||
|
|||
|
|||
NPY_INLINE void |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
needs static
6e03829
to
3572e86
Compare
3572e86
to
dd32477
Compare
@juliantaylor: Done |
can you squash the commits? |
@juliantaylor: I'm not sure the first commit is broken? I think the tests just got cancelled |
It looks like I managed to confuse travis though, as the later tests are definitely running with a different set of source code to the early ones |
hm looks like it. Its fine then thanks |
Alarmingly, travis doesn't even have the same sha1 as the commit that cross is by |
Previously, this would cause a segfault in .sort.
Fixes #8210