Skip to content

Z
Zope
Commit 6fe3e53d authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Added logic to check for AttributeErrors when getting attributes from 

wrapped sub-objects and containers so as to avoid weird unintended acquisition
accidents.

Also fixed a memory leak in error handling.
parent 85e2b7b3
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 16 deletions
lib/Components/ExtensionClass/Acquisition.c
View file @ 6fe3e53d
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE. DAMAGE.
$Id: Acquisition.c,v 1.29 1999/07/11 13:49:08 jim Exp $ $Id: Acquisition.c,v 1.30 1999/07/28 17:59:46 jim Exp $
If you have questions regarding this software, If you have questions regarding this software,
contact: contact:
...@@ -381,11 +381,12 @@ Wrapper_acquire(Wrapper *self, PyObject *oname, ...@@ -381,11 +381,12 @@ Wrapper_acquire(Wrapper *self, PyObject *oname,
oname,filter,extra,orig,1,1); oname,filter,extra,orig,1,1);
if (r) goto acquired; if (r) goto acquired;
PyErr_Fetch(&r,&v,&tb); PyErr_Fetch(&r,&v,&tb);
if (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0) if (r && (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0))
{ {
PyErr_Restore(r,v,tb); PyErr_Restore(r,v,tb);
return NULL; return NULL;
} }
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL; r=NULL;
} }
else if ((r=PyObject_GetAttr(self->obj,oname))) else if ((r=PyObject_GetAttr(self->obj,oname)))
...@@ -412,6 +413,16 @@ Wrapper_acquire(Wrapper *self, PyObject *oname, ...@@ -412,6 +413,16 @@ Wrapper_acquire(Wrapper *self, PyObject *oname,
} }
else return r; else return r;
} }
else {
PyErr_Fetch(&r,&v,&tb);
if (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0)
{
PyErr_Restore(r,v,tb);
return NULL;
}
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL;
}
PyErr_Clear(); PyErr_Clear();
} }
...@@ -480,7 +491,7 @@ handle_Acquired(Wrapper *self, PyObject *oname, PyObject *r) ...@@ -480,7 +491,7 @@ handle_Acquired(Wrapper *self, PyObject *oname, PyObject *r)
static PyObject * static PyObject *
Wrapper_getattro_(Wrapper *self, PyObject *oname, int sob, int sco) Wrapper_getattro_(Wrapper *self, PyObject *oname, int sob, int sco)
{ {
PyObject *r; PyObject *r, *v, *tb;
char *name; char *name;
name=PyString_AsString(oname); name=PyString_AsString(oname);
...@@ -506,7 +517,18 @@ Wrapper_getattro_(Wrapper *self, PyObject *oname, int sob, int sco) ...@@ -506,7 +517,18 @@ Wrapper_getattro_(Wrapper *self, PyObject *oname, int sob, int sco)
ASSIGN(r,__of__(r,OBJECT(self))); ASSIGN(r,__of__(r,OBJECT(self)));
return r; return r;
} }
if (self->obj) PyErr_Clear(); if (self->obj)
if (sob) {
PyErr_Fetch(&r,&v,&tb);
if (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0)
{
PyErr_Restore(r,v,tb);
return NULL;
}
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL;
}
else PyErr_Clear();
if ((*name != '_') if ((*name != '_')
&& self->container && sco) && self->container && sco)
...@@ -548,7 +570,7 @@ Wrapper_getattro(Wrapper *self, PyObject *oname) ...@@ -548,7 +570,7 @@ Wrapper_getattro(Wrapper *self, PyObject *oname)
static PyObject * static PyObject *
Xaq_getattro(Wrapper *self, PyObject *oname) Xaq_getattro(Wrapper *self, PyObject *oname)
{ {
PyObject *r; PyObject *r, *v, *tb;
char *name; char *name;
name=PyString_AsString(oname); name=PyString_AsString(oname);
...@@ -588,7 +610,16 @@ Xaq_getattro(Wrapper *self, PyObject *oname) ...@@ -588,7 +610,16 @@ Xaq_getattro(Wrapper *self, PyObject *oname)
else if (has__of__(r)) ASSIGN(r,__of__(r,OBJECT(self))); else if (has__of__(r)) ASSIGN(r,__of__(r,OBJECT(self)));
return r; return r;
} }
if (self->obj) PyErr_Clear(); if (self->obj) {
PyErr_Fetch(&r,&v,&tb);
if (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0)
{
PyErr_Restore(r,v,tb);
return NULL;
}
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL;
}
PyErr_SetObject(PyExc_AttributeError,oname); PyErr_SetObject(PyExc_AttributeError,oname);
return NULL; return NULL;
...@@ -961,7 +992,7 @@ void ...@@ -961,7 +992,7 @@ void
initAcquisition() initAcquisition()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.29 $"; char *rev="$Revision: 1.30 $";
PURE_MIXIN_CLASS(Acquirer, PURE_MIXIN_CLASS(Acquirer,
"Base class for objects that implicitly" "Base class for objects that implicitly"
" acquire attributes from containers\n" " acquire attributes from containers\n"
...@@ -980,7 +1011,7 @@ initAcquisition() ...@@ -980,7 +1011,7 @@ initAcquisition()
/* Create the module and add the functions */ /* Create the module and add the functions */
m = Py_InitModule4("Acquisition", methods, m = Py_InitModule4("Acquisition", methods,
"Provide base classes for acquiring objects\n\n" "Provide base classes for acquiring objects\n\n"
"$Id: Acquisition.c,v 1.29 1999/07/11 13:49:08 jim Exp $\n", "$Id: Acquisition.c,v 1.30 1999/07/28 17:59:46 jim Exp $\n",
OBJECT(NULL),PYTHON_API_VERSION); OBJECT(NULL),PYTHON_API_VERSION);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
......
lib/Components/ExtensionClass/src/Acquisition.c
View file @ 6fe3e53d
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE. DAMAGE.
$Id: Acquisition.c,v 1.29 1999/07/11 13:49:08 jim Exp $ $Id: Acquisition.c,v 1.30 1999/07/28 17:59:46 jim Exp $
If you have questions regarding this software, If you have questions regarding this software,
contact: contact:
...@@ -381,11 +381,12 @@ Wrapper_acquire(Wrapper *self, PyObject *oname, ...@@ -381,11 +381,12 @@ Wrapper_acquire(Wrapper *self, PyObject *oname,
oname,filter,extra,orig,1,1); oname,filter,extra,orig,1,1);
if (r) goto acquired; if (r) goto acquired;
PyErr_Fetch(&r,&v,&tb); PyErr_Fetch(&r,&v,&tb);
if (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0) if (r && (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0))
{ {
PyErr_Restore(r,v,tb); PyErr_Restore(r,v,tb);
return NULL; return NULL;
} }
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL; r=NULL;
} }
else if ((r=PyObject_GetAttr(self->obj,oname))) else if ((r=PyObject_GetAttr(self->obj,oname)))
...@@ -412,6 +413,16 @@ Wrapper_acquire(Wrapper *self, PyObject *oname, ...@@ -412,6 +413,16 @@ Wrapper_acquire(Wrapper *self, PyObject *oname,
} }
else return r; else return r;
} }
else {
PyErr_Fetch(&r,&v,&tb);
if (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0)
{
PyErr_Restore(r,v,tb);
return NULL;
}
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL;
}
PyErr_Clear(); PyErr_Clear();
} }
...@@ -480,7 +491,7 @@ handle_Acquired(Wrapper *self, PyObject *oname, PyObject *r) ...@@ -480,7 +491,7 @@ handle_Acquired(Wrapper *self, PyObject *oname, PyObject *r)
static PyObject * static PyObject *
Wrapper_getattro_(Wrapper *self, PyObject *oname, int sob, int sco) Wrapper_getattro_(Wrapper *self, PyObject *oname, int sob, int sco)
{ {
PyObject *r; PyObject *r, *v, *tb;
char *name; char *name;
name=PyString_AsString(oname); name=PyString_AsString(oname);
...@@ -506,7 +517,18 @@ Wrapper_getattro_(Wrapper *self, PyObject *oname, int sob, int sco) ...@@ -506,7 +517,18 @@ Wrapper_getattro_(Wrapper *self, PyObject *oname, int sob, int sco)
ASSIGN(r,__of__(r,OBJECT(self))); ASSIGN(r,__of__(r,OBJECT(self)));
return r; return r;
} }
if (self->obj) PyErr_Clear(); if (self->obj)
if (sob) {
PyErr_Fetch(&r,&v,&tb);
if (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0)
{
PyErr_Restore(r,v,tb);
return NULL;
}
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL;
}
else PyErr_Clear();
if ((*name != '_') if ((*name != '_')
&& self->container && sco) && self->container && sco)
...@@ -548,7 +570,7 @@ Wrapper_getattro(Wrapper *self, PyObject *oname) ...@@ -548,7 +570,7 @@ Wrapper_getattro(Wrapper *self, PyObject *oname)
static PyObject * static PyObject *
Xaq_getattro(Wrapper *self, PyObject *oname) Xaq_getattro(Wrapper *self, PyObject *oname)
{ {
PyObject *r; PyObject *r, *v, *tb;
char *name; char *name;
name=PyString_AsString(oname); name=PyString_AsString(oname);
...@@ -588,7 +610,16 @@ Xaq_getattro(Wrapper *self, PyObject *oname) ...@@ -588,7 +610,16 @@ Xaq_getattro(Wrapper *self, PyObject *oname)
else if (has__of__(r)) ASSIGN(r,__of__(r,OBJECT(self))); else if (has__of__(r)) ASSIGN(r,__of__(r,OBJECT(self)));
return r; return r;
} }
if (self->obj) PyErr_Clear(); if (self->obj) {
PyErr_Fetch(&r,&v,&tb);
if (r != PyExc_AttributeError || PyObject_Compare(v,oname) != 0)
{
PyErr_Restore(r,v,tb);
return NULL;
}
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL;
}
PyErr_SetObject(PyExc_AttributeError,oname); PyErr_SetObject(PyExc_AttributeError,oname);
return NULL; return NULL;
...@@ -961,7 +992,7 @@ void ...@@ -961,7 +992,7 @@ void
initAcquisition() initAcquisition()
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.29 $"; char *rev="$Revision: 1.30 $";
PURE_MIXIN_CLASS(Acquirer, PURE_MIXIN_CLASS(Acquirer,
"Base class for objects that implicitly" "Base class for objects that implicitly"
" acquire attributes from containers\n" " acquire attributes from containers\n"
...@@ -980,7 +1011,7 @@ initAcquisition() ...@@ -980,7 +1011,7 @@ initAcquisition()
/* Create the module and add the functions */ /* Create the module and add the functions */
m = Py_InitModule4("Acquisition", methods, m = Py_InitModule4("Acquisition", methods,
"Provide base classes for acquiring objects\n\n" "Provide base classes for acquiring objects\n\n"
"$Id: Acquisition.c,v 1.29 1999/07/11 13:49:08 jim Exp $\n", "$Id: Acquisition.c,v 1.30 1999/07/28 17:59:46 jim Exp $\n",
OBJECT(NULL),PYTHON_API_VERSION); OBJECT(NULL),PYTHON_API_VERSION);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7