bpo-35269: Fix a possible segfault involving a newly-created coroutine#10585
Merged
miss-islington merged 2 commits intoNov 18, 2018
Merged
Conversation
coro->cr_origin wasn't initialized if compute_cr_origin() failed in PyCoro_New(), which would cause a crash during the coroutine's deallocation.
asvetlov
requested changes
Nov 17, 2018
| Py_DECREF(coro); | ||
| return NULL; | ||
| } | ||
| ((PyCoroObject *)coro)->cr_origin = cr_origin; |
Contributor
There was a problem hiding this comment.
The PR can be reduced to very trivial change: move this line before if (!cr_origin) {, do nothing else
Contributor
Author
There was a problem hiding this comment.
Sure, but I had wanted to use the opportunity to simplify the code.
|
A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated. Once you have made the requested changes, please leave a comment on this pull request containing the phrase |
Contributor
Author
|
I have made the requested changes; please review again. |
|
Thanks for making the requested changes! @asvetlov: please review the changes made to this pull request. |
asvetlov
approved these changes
Nov 18, 2018
Contributor
|
Thanks @ZackerySpytz for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Nov 18, 2018
pythonGH-10585) coro->cr_origin wasn't initialized if compute_cr_origin() failed in PyCoro_New(), which would cause a crash during the coroutine's deallocation. https://bugs.python.org/issue35269 (cherry picked from commit 062a57b) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
|
GH-10590 is a backport of this pull request to the 3.7 branch. |
miss-islington
added a commit
that referenced
this pull request
Nov 18, 2018
GH-10585) coro->cr_origin wasn't initialized if compute_cr_origin() failed in PyCoro_New(), which would cause a crash during the coroutine's deallocation. https://bugs.python.org/issue35269 (cherry picked from commit 062a57b) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
|
Contributor
|
Belated 👍, thanks @ZackerySpytz and @asvetlov for handling this! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
coro->cr_origin wasn't initialized if compute_cr_origin() failed in
PyCoro_New(), which would cause a crash during the coroutine's
deallocation.
https://bugs.python.org/issue35269