Skip to content

bpo-42099: Fix reference to ob_type in unionobject.c and ceval #22829

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
markshannon merged 3 commits into from
Oct 27, 2020
Merged

bpo-42099: Fix reference to ob_type in unionobject.c and ceval #22829

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
053162d
Use Py_TYPE() rather than o->ob_type.
nascheme Oct 20, 2020
cc682eb
Add blurb.
nascheme Oct 20, 2020
ac42c98
Remove blurb, not useful piece of news.
nascheme Oct 27, 2020
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
Next Next commit
Use Py_TYPE() rather than o->ob_type.
  • Loading branch information
@nascheme
nascheme committed Oct 20, 2020
commit 053162dbcc41e0b6c139e29cd559e17e2a8bb174
2 changes: 1 addition & 1 deletion Objects/unionobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ unionobject_dealloc(PyObject *self)
unionobject *alias = (unionobject *)self;

Py_XDECREF(alias->args);
self->ob_type->tp_free(self);
Py_TYPE(self)->tp_free(self);
}

static Py_hash_t
Expand Down
2 changes: 1 addition & 1 deletion Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3186,7 +3186,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)

descr = _PyType_Lookup(type, name);
if (descr == NULL ||
descr->ob_type->tp_descr_get == NULL ||
Py_TYPE(descr)->tp_descr_get == NULL ||
!PyDescr_IsData(descr))
{
dictptr = (PyObject **) ((char *)owner + type->tp_dictoffset);
Expand Down