bpo-28994: PyErr_NormalizeException() no longer recursive. #2035
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
2f84b64 to
4dcbd8f
Compare
pitrou
reviewed
Jun 13, 2017
Python/errors.c
Outdated
| @@ -306,18 +313,17 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb) | |||
| } | |||
| /* normalize recursively */ | |||
| tstate = PyThreadState_GET(); | |||
| if (++tstate->recursion_depth > Py_GetRecursionLimit()) { | |||
| --tstate->recursion_depth; | |||
| if (++recursion_depth > Py_GetRecursionLimit() - tstate->recursion_depth) { | |||
There was a problem hiding this comment.
Since the function isn't recursive anymore, is there any reason you're still bothering with recursion_depth?
There was a problem hiding this comment.
A guard against infinite loop.
pitrou
reviewed
Jun 13, 2017
Python/errors.c
Outdated
| @@ -306,18 +313,17 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb) | |||
| } | |||
| /* normalize recursively */ | |||
embray
pushed a commit
to embray/cpython
that referenced
this pull request
Nov 9, 2017
…sion. (python#2035) MemoryError raised when normalizing a RecursionError raised during exception normalization now not always causes a fatal error.
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.
https://bugs.python.org/issue28994