Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-128049: Fix type confusion bug with the return value of a custom ExceptionGroup split function#128079

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
iritkatriel merged 7 commits intopython:mainfromNico-Posada:fix-issue-128049
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
NextNext commit
have checks for the return value of split be done outside of asserts
  • Loading branch information
@Nico-Posada
Nico-Posada committedDec 18, 2024
commitfb869d428fb78b16c8ccda630a8bff5c59afb60d
14 changes: 14 additions & 0 deletionsLib/test/test_exception_group.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -576,6 +576,20 @@ def test_iteration_full_tracebacks(self):
expected_tbs[i])


class CustomExceptionGroupSplitTest(ExceptionGroupTestBase):
# See https://github.com/python/cpython/issues/128049
def test_invalid_split_return_value(self):
class Evil(BaseExceptionGroup):
def split(self, types):
return "NOT A TUPLE"

with self.assertRaises(TypeError):
try:
raise Evil("message here", [Exception()])
except* Exception:
pass


class ExceptionGroupSplitTestBase(ExceptionGroupTestBase):

def split_exception_group(self, eg, types):
Expand Down
11 changes: 9 additions & 2 deletionsPython/ceval.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2095,8 +2095,15 @@ _PyEval_ExceptionGroupMatch(PyObject* exc_value, PyObject *match_type,
if (pair == NULL) {
return -1;
}
assert(PyTuple_CheckExact(pair));
assert(PyTuple_GET_SIZE(pair) == 2);

if (!PyTuple_CheckExact(pair) || PyTuple_Size(pair) != 2) {
PyErr_Format(PyExc_TypeError,
"%s.split must return a 2-tuple",
Py_TYPE(exc_value)->tp_name);
Py_DECREF(pair);
return -1;
}

*match = Py_NewRef(PyTuple_GET_ITEM(pair, 0));
*rest = Py_NewRef(PyTuple_GET_ITEM(pair, 1));
Py_DECREF(pair);
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp