FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-29587: Remove the exc_value NULL check in _gen_throw() by cjerdonek · Pull Request #19877 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

bpo-29587: Remove the exc_value NULL check in _gen_throw() #19877

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.

Sign up for GitHub

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

Merged
cjerdonek merged 2 commits into from
May 3, 2020
Conversation 2 Commits 2 Checks 0 Files changed
Merged

bpo-29587: Remove the exc_value NULL check in _gen_throw() #19877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66aa645
Remove the exc_value NULL check and add a failing test.
cjerdonek May 3, 2020
66ae854
Check that exc_type doesn't equal Py_None.
cjerdonek May 3, 2020
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
20 changes: 20 additions & 0 deletions Lib/test/test_generators.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,26 @@ def f():
context = cm.exception.__context__
self.assertEqual((type(context), context.args), (KeyError, ('a',)))

def test_throw_after_none_exc_type(self):
def g():
try:
raise KeyError
except KeyError:
pass

try:
yield
except Exception:
# Without the `gi_exc_state.exc_type != Py_None` in
# _gen_throw(), this line was causing a crash ("Segmentation
# fault (core dumped)") on e.g. Fedora 32.
raise RuntimeError

gen = g()
gen.send(None)
with self.assertRaises(RuntimeError) as cm:
gen.throw(ValueError)


class YieldFromTests(unittest.TestCase):
def test_generator_gi_yieldfrom(self):
Expand Down
9 changes: 5 additions & 4 deletions Objects/genobject.c
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -512,11 +512,12 @@ _gen_throw(PyGenObject *gen, int close_on_genexit,
}

PyErr_Restore(typ, val, tb);
/* XXX Should we also handle the case where exc_type is true and
exc_value is false? */
if (gen->gi_exc_state.exc_type && gen->gi_exc_state.exc_value) {
/* XXX It seems like we shouldn't have to check not equal to Py_None
here because exc_type should only ever be a class. But not including
this check was causing crashes on certain tests e.g. on Fedora. */
if (gen->gi_exc_state.exc_type && gen->gi_exc_state.exc_type != Py_None) {
Py_INCREF(gen->gi_exc_state.exc_type);
Py_INCREF(gen->gi_exc_state.exc_value);
Py_XINCREF(gen->gi_exc_state.exc_value);
Py_XINCREF(gen->gi_exc_state.exc_traceback);
_PyErr_ChainExceptions(gen->gi_exc_state.exc_type,
gen->gi_exc_state.exc_value, gen->gi_exc_state.exc_traceback);
Expand Down
Back | FazBrowse Home | New Git URL