Gui: Prevent crash when trying to access a deleted object from a Sele…

…ctionObject
FreeCAD · Jan 7, 2021 · 1bfd764 · 1bfd764
1 parent 94405e3
commit 1bfd764
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Gui/SelectionObjectPy.xml b/src/Gui/SelectionObjectPy.xml
@@ -56,7 +56,7 @@
 	  </Attribute>
 	  <Attribute Name="Document" ReadOnly="true">
 		  <Documentation>
-			  <UserDocu>Selected document</UserDocu>
+			  <UserDocu>Document of the selected object</UserDocu>
 		  </Documentation>
 		  <Parameter Name="Document" Type="Object" />
 	  </Attribute>

diff --git a/src/Gui/SelectionObjectPyImp.cpp b/src/Gui/SelectionObjectPyImp.cpp
@@ -100,12 +100,18 @@ Py::String SelectionObjectPy::getDocumentName(void) const
 
 Py::Object SelectionObjectPy::getDocument(void) const
 {
-    return Py::Object(getSelectionObjectPtr()->getObject()->getDocument()->getPyObject(), true);
+    App::DocumentObject *obj = getSelectionObjectPtr()->getObject();
+    if (!obj)
+        throw Py::RuntimeError("Cannot get document of deleted object");
+    return Py::Object(obj->getDocument()->getPyObject(), true);
 }
 
 Py::Object SelectionObjectPy::getObject(void) const
 {
-    return Py::Object(getSelectionObjectPtr()->getObject()->getPyObject(), true);
+    App::DocumentObject *obj = getSelectionObjectPtr()->getObject();
+    if (!obj)
+        throw Py::RuntimeError("Object already deleted");
+    return Py::Object(obj->getPyObject(), true);
 }
 
 Py::Tuple SelectionObjectPy::getSubObjects(void) const