Fix possible leak of return of PySequence_GetItem. #13333
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
anntzer
reviewed
Jan 31, 2019
| @@ -727,6 +727,7 @@ static PyObject *Py_convert_to_string(PyObject *self, PyObject *args, PyObject * | ||
| return NULL; | ||
| } | ||
| codes[i] = PyBytes_AsString(item); | ||
| Py_DECREF(item); |
There was a problem hiding this comment.
Just change the PyArg_ParseTuple call to use a (yyyyy) format for parsing the codes argument instead?
There was a problem hiding this comment.
I am 50/50 on that. It lets python do more of the work, but is also a bigger change.
There was a problem hiding this comment.
I think all of our callers pass the right length lists, but as I'm targeting 3.0.3 with this, I'm not sure if it's quite as safe to be backporting that version.
There was a problem hiding this comment.
But we already error out a few lines above if the length is not 5.
Anyways I don't want to insist too much on this, if you don't want to make the bigger change that's fine with me too.
tacaswell
approved these changes
Feb 1, 2019
NelleV
approved these changes
Feb 2, 2019
meeseeksmachine
pushed a commit
to meeseeksmachine/matplotlib
that referenced
this pull request
Feb 2, 2019
timhoffm
added a commit
that referenced
this pull request
Feb 2, 2019
…333-on-v3.0.x Backport PR #13333 on branch v3.0.x (Fix possible leak of return of PySequence_GetItem.)
6 tasks
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.
PR Summary
PySequence_GetItemreturns a new reference, which we should decrement.Note: Technically, the string (from
PyBytes_AsString) requires the object to be ref'd, but we know it won't get GC'd because there's a ref by the containing object, and doing it early means we don't have to worry about error handling.PR Checklist