Skip to content

bpo-44483: Fix crash in union object with bad __module__ #26848

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
serhiy-storchaka merged 2 commits into from
Jun 22, 2021
Merged

bpo-44483: Fix crash in union object with bad __module__ #26848

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
8934e6e
Fix crash in union object with bad __module__
Fidget-Spinner Jun 22, 2021
1b8f932
Apply Serhiy's comments
Fidget-Spinner Jun 22, 2021
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
9 changes: 9 additions & 0 deletions Lib/test/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,15 @@ def __eq__(self, other):
with self.assertRaises(TypeError):
issubclass(list, type_)

def test_or_type_operator_with_bad_module(self):
class TypeVar:
@property
def __module__(self):
1 / 0
# Crashes in Issue44483
with self.assertRaises(ZeroDivisionError):
str | TypeVar()

def test_ellipsis_type(self):
self.assertIsInstance(Ellipsis, types.EllipsisType)

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2021-06-22-19-08-19.bpo-44483.eq2f7T.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a crash in ``types.Union`` objects when creating a union of an object
with bad ``__module__`` field.
17 changes: 14 additions & 3 deletions Objects/unionobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,17 +284,28 @@ is_new_type(PyObject *obj)
return is_typing_module(obj);
}

// Emulates short-circuiting behavior of the ``||`` operator
// while also checking negative values.
#define CHECK_RES(res) { \
int result = res; \
if (result) { \
return result; \
} \
}

// Returns 1 on true, 0 on false, and -1 on error.
static int
is_unionable(PyObject *obj)
{
if (obj == Py_None) {
return 1;
}
PyTypeObject *type = Py_TYPE(obj);
CHECK_RES(is_typevar(obj));
CHECK_RES(is_new_type(obj));
CHECK_RES(is_special_form(obj));
return (
is_typevar(obj) ||
is_new_type(obj) ||
is_special_form(obj) ||
// The following checks never fail.
PyType_Check(obj) ||
PyObject_TypeCheck(obj, &Py_GenericAliasType) ||
type == &_Py_UnionType);
Expand Down