suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ Fix crash when passing emtpy argument list to Path.Tooltable

Browse Source
This commit is contained in:
wmayer 2015-07-09 13:14:11 +02:00
parent ce5ce0f933
commit 18a770f616
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Path/App/TooltablePyImp.cpp
View File

@ -354,8 +354,13 @@ PyObject *TooltablePy::PyMake(struct _typeobject *, PyObject *, PyObject *) //
// constructor method
int TooltablePy::PyInit(PyObject* args, PyObject* /*kwd*/)
{
if (PyArg_ParseTuple(args, "")) {
return 0;
}
PyErr_Clear(); // set by PyArg_ParseTuple()
PyObject *pcObj;
if (PyArg_ParseTuple(args, "|O!", &(PyDict_Type), &pcObj)) {
if (PyArg_ParseTuple(args, "O!", &(PyDict_Type), &pcObj)) {
PyObject *key, *value;
Py_ssize_t pos = 0;
while (PyDict_Next(pcObj, &pos, &key, &value)) {
@ -370,8 +375,8 @@ int TooltablePy::PyInit(PyObject* args, PyObject* /*kwd*/)
return 0;
}
PyErr_Clear(); // set by PyArg_ParseTuple()
if (PyArg_ParseTuple(args, "|O!", &(PyList_Type), &pcObj)) {
if (PyArg_ParseTuple(args, "O!", &(PyList_Type), &pcObj)) {
Py::List list(pcObj);
for (Py::List::iterator it = list.begin(); it != list.end(); ++it) {
if (PyObject_TypeCheck((*it).ptr(), &(Path::ToolPy::Type))) {
@ -381,9 +386,9 @@ int TooltablePy::PyInit(PyObject* args, PyObject* /*kwd*/)
}
return 0;
}
PyErr_SetString(PyExc_TypeError, "Argument must be a list or a dictionary");
return -1;
PyErr_SetString(PyExc_TypeError, "Argument must be either empty or a list or a dictionary");
return -1;
}
// Commands get/set