BUG: check return value from PyArray_PromoteTypes #12032
Merged
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
|
I have no idea why the debug build is segfaulting. |
eric-wieser
requested changes
Sep 25, 2018
|
Fixing |
eric-wieser
reviewed
Sep 26, 2018
| PyObject *otmp = PySequence_GetItem(op, i); | ||
| if (otmp == NULL) { | ||
| goto fail; | ||
| } | ||
| if (!PyArray_CheckAnyScalar(otmp)) { | ||
| newtype = PyArray_DescrFromObject(otmp, intype); | ||
| Py_XDECREF(intype); |
There was a problem hiding this comment.
Put the decref on this line, and then you can omit it below.
eric-wieser
reviewed
Sep 26, 2018
| @@ -2081,14 +2084,15 @@ PyArray_ConvertToCommonType(PyObject *op, int *retn) | |||
| newtype = PyArray_DescrFromObject(otmp, stype); | |||
| Py_XDECREF(stype); | |||
There was a problem hiding this comment.
Same again - you're done with the object already by this line, so can decref it immediately
65d0a85 to
df68e64
Compare
eric-wieser
approved these changes
Sep 27, 2018
|
Thanks @mattip! |
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.
Fixes #12031. by checking the return value from
PyArray_PromoteTypes. Also make sure to decrefotmpon error.