Skip to content

bpo-46561: Ensure operands to __get__ survive the call #30979

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

Closed
tekknolagi wants to merge 3 commits into from
Closed

bpo-46561: Ensure operands to __get__ survive the call #30979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a47eaac
Ensure operands to __get__ survive the call
tekknolagi Jan 28, 2022
a86fdcc
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 28, 2022
a23a62e
Merge branch 'main' into mb-fix-__get__
serhiy-storchaka Feb 23, 2024
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
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-01-28-07-10-41.bpo-46561.y3KHGB.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make sure arguments to __get__ are owned
11 changes: 9 additions & 2 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2308,8 +2308,12 @@ _PyObject_LookupSpecial(PyObject *self, PyObject *attr)
descrgetfunc f;
if ((f = Py_TYPE(res)->tp_descr_get) == NULL)
Py_INCREF(res);
else
res = f(res, self, (PyObject *)(Py_TYPE(self)));
else {
PyObject* descr = res;
Py_INCREF(descr);
res = f(descr, self, (PyObject *)(Py_TYPE(self)));
Py_DECREF(descr);
}
}
return res;
}
Expand Down Expand Up @@ -2343,7 +2347,10 @@ lookup_maybe_method(PyObject *self, PyObject *attr, int *unbound)
Py_INCREF(res);
}
else {
PyObject* descr = res;
Py_INCREF(descr);
res = f(res, self, (PyObject *)(Py_TYPE(self)));
Py_DECREF(descr);
}
}
return res;
Expand Down