mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #5322: Fixed setting __new__ to a PyCFunction inside Python code.

Browse source 
Original patch by Andreas Stührk.
This commit is contained in:
Serhiy Storchaka 2016-12-02 08:42:43 +02:00
parent 028ace1ccb
commit 5adfac2c1b
3 changed files with 119 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Objects/typeobject.c
View file

@ -6798,7 +6798,34 @@ update_one_slot(PyTypeObject *type, slotdef *p)
sanity checks and constructing a new argument
list. Cut all that nonsense short -- this speeds
up instance creation tremendously. */
specific = (void *)type->tp_new;
PyObject *self = PyCFunction_GET_SELF(descr);
if (!self || !PyType_Check(self)) {
/* This should never happen because
tp_new_wrapper expects a type for self.
Use slot_tp_new which will call
tp_new_wrapper which will raise an
exception. */
specific = (void *)slot_tp_new;
}
else {
PyTypeObject *staticbase;
specific = ((PyTypeObject *)self)->tp_new;
/* Check that the user does not do anything
silly and unsafe like object.__new__(dict).
To do this, we check that the most derived
base that's not a heap type is this type. */
staticbase = type->tp_base;
while (staticbase &&
(staticbase->tp_flags & Py_TPFLAGS_HEAPTYPE))
staticbase = staticbase->tp_base;
if (staticbase &&
staticbase->tp_new != specific)
/* Seems to be unsafe, better use
slot_tp_new which will call
tp_new_wrapper which will raise an
exception if it is unsafe. */
specific = (void *)slot_tp_new;
}
/* XXX I'm not 100% sure that there isn't a hole
in this reasoning that requires additional
sanity checks. I'll buy the first person to