mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

proxy_compare(): Make sure that we unwrap both objects being compared if

Browse source 
both are proxy objects.
This commit is contained in:
Fred Drake 2001-12-19 16:44:30 +00:00
parent 694ed091af
commit 2a908f6b7b
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/weakrefobject.c
View file

@ -220,6 +220,13 @@ proxy_checkref(PyWeakReference *proxy)
o = PyWeakref_GET_OBJECT(o); \
}
#define UNWRAP_I(o) \
if (PyWeakref_CheckProxy(o)) { \
if (!proxy_checkref((PyWeakReference *)o)) \
return -1; \
o = PyWeakref_GET_OBJECT(o); \
}
#define WRAP_UNARY(method, generic) \
static PyObject * \
method(PyObject *proxy) { \
@ -284,11 +291,11 @@ proxy_setattr(PyWeakReference *proxy, PyObject *name, PyObject *value)
}
static int
proxy_compare(PyWeakReference *proxy, PyObject *v)
proxy_compare(PyObject *proxy, PyObject *v)
{
if (!proxy_checkref(proxy))
return -1;
return PyObject_Compare(PyWeakref_GET_OBJECT(proxy), v);
UNWRAP_I(proxy);
UNWRAP_I(v);
return PyObject_Compare(proxy, v);
}
/* number slots */
@ -451,7 +458,7 @@ _PyWeakref_ProxyType = {
(printfunc)proxy_print, /*tp_print*/
0, /*tp_getattr*/
0, /*tp_setattr*/
(cmpfunc)proxy_compare, /*tp_compare*/
proxy_compare, /*tp_compare*/
(unaryfunc)proxy_repr, /*tp_repr*/
&proxy_as_number, /*tp_as_number*/
&proxy_as_sequence, /*tp_as_sequence*/
@ -482,7 +489,7 @@ _PyWeakref_CallableProxyType = {
(printfunc)proxy_print, /*tp_print*/
0, /*tp_getattr*/
0, /*tp_setattr*/
(cmpfunc)proxy_compare, /*tp_compare*/
proxy_compare, /*tp_compare*/
(unaryfunc)proxy_repr, /*tp_repr*/
&proxy_as_number, /*tp_as_number*/
&proxy_as_sequence, /*tp_as_sequence*/