boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-22 05:22:45 +00:00
Code Issues Projects Releases Wiki Activity

Enhanced pickle safety measures.

Browse Source 
[SVN r9358]
This commit is contained in:
Ralf W. Grosse-Kunstleve
2001-02-27 18:56:57 +00:00
parent 0178f5fc0c
commit dc20d643fc
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/classes.cpp
View File

@@ -92,26 +92,41 @@ namespace {
ref getstate(PyObject_GetAttrString(obj, const_cast<char*>("__getstate__")),
ref::null_ok);
PyErr_Clear();
ref dict(PyObject_GetAttrString(obj, const_cast<char*>("__dict__")), ref::null_ok);
PyErr_Clear();
if (getstate.get() != 0)
{
if (dict.get() != 0 && dictionary(dict).size() > 0)
{
ref getstate_manages_dict(PyObject_GetAttrString(instance_class.get(), const_cast<char*>("__getstate_manages_dict__")), ref::null_ok);
PyErr_Clear();
if (getstate_manages_dict.get() == 0)
{
PyErr_SetString(PyExc_RuntimeError, "__getstate_manages_dict__ not defined");
throw error_already_set();
}
}
ref state = ref(PyEval_CallObject(getstate.get(), NULL));
return tuple(instance_class, initargs, state);
}
if (getinitargs.get() == 0) {
ref auto_pickle(PyObject_GetAttrString(instance_class.get(), const_cast<char*>("__auto_pickle__")), ref::null_ok);
PyErr_Clear();
if (auto_pickle.get() == 0) {
PyErr_SetString(PyExc_AttributeError, "auto_pickle not enabled");
throw error_already_set();
}
if (getinitargs.get() == 0)
{
ref dict_defines_state(PyObject_GetAttrString(instance_class.get(), const_cast<char*>("__dict_defines_state__")), ref::null_ok);
PyErr_Clear();
if (dict_defines_state.get() == 0)
{
PyErr_SetString(PyExc_RuntimeError, "__dict_defines_state__ not defined");
throw error_already_set();
}
}
ref state(PyObject_GetAttrString(obj, const_cast<char*>("__dict__")), ref::null_ok);
PyErr_Clear();
if (state.get() != 0 && dictionary(state).size() > 0)
if (dict.get() != 0 && dictionary(dict).size() > 0)
{
return tuple(instance_class, initargs, state);
return tuple(instance_class, initargs, dict);
}
return tuple(instance_class, initargs);