BUG: vtkPythonUtil: Check if vtkPythonMap is valid

Kitware · May 26, 2016 · d382a3b · d382a3b
1 parent 61b8743
commit d382a3b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Wrapping/PythonCore/vtkPythonUtil.cxx b/Wrapping/PythonCore/vtkPythonUtil.cxx
@@ -437,7 +437,7 @@ PyObject *vtkPythonUtil::GetObjectFromPointer(vtkObjectBase *ptr)
 {
   PyObject *obj = NULL;
 
-  if (ptr)
+  if (ptr && vtkPythonMap)
     {
     vtkPythonObjectMap::iterator i =
       vtkPythonMap->ObjectMap->find(ptr);
@@ -777,6 +777,12 @@ PyObject *vtkPythonUtil::GetObjectFromObject(
 void *vtkPythonUtil::GetPointerFromSpecialObject(
   PyObject *obj, const char *result_type, PyObject **newobj)
 {
+  if (vtkPythonMap == NULL)
+    {
+    PyErr_SetString(PyExc_TypeError, "method requires a vtkPythonMap");
+    return NULL;
+    }
+
   const char *object_type =
     vtkPythonUtil::StripModule(Py_TYPE(obj)->tp_name);