[[ Bug 18273 ]] Prevent crash when rendering card with invalid objptr

livecodeali · livecodeali · commit 0a86654535b7 · 2017-03-21T13:17:27.000Z
diff --git a/docs/notes/bugfix-18273.md b/docs/notes/bugfix-18273.md
@@ -0,0 +1 @@
+# Prevent crash when rendering card with invalid objptr
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -3040,11 +3040,15 @@ void MCCard::drawselectedchildren(MCDC *dc)
         return;
     do
     {
-        if (tptr -> getref() -> getstate(CS_SELECTED))
-            tptr->getref()->drawselected(dc);
+        MCControl *t_control = tptr->getref();
+        if (t_control != nullptr)
+        {
+            if (tptr -> getref() -> getstate(CS_SELECTED))
+                tptr->getref()->drawselected(dc);
         
-        if (tptr -> getrefasgroup() != nil)
-            tptr -> getrefasgroup() -> drawselectedchildren(dc);
+            if (tptr -> getrefasgroup() != nil)
+                tptr -> getrefasgroup() -> drawselectedchildren(dc);
+        }
             
         tptr = tptr->next();
     }
@@ -3115,7 +3119,9 @@ void MCCard::draw(MCDC *dc, const MCRectangle& dirty, bool p_isolated)
 		MCObjptr *tptr = objptrs;
 		do
 		{
-			tptr->getref()->redraw(dc, dirty);
+            MCControl *t_control = tptr->getref();
+            if (t_control != nullptr)
+                t_control->redraw(dc, dirty);
 			tptr = tptr->next();
 		}
 		while (tptr != objptrs);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Prevent crash when rendering card with invalid objptr`