Ticket #9168: crash_on_bad_node_lookup.patch

engines/sci/graphics/animate.cpp

@@ -97 +97 @@
                         // Call .doit method of that object
                         invoke_selector(_s, curObject, g_sci->getKernel()->_selectorCache.doit, kContinueOnInvalidSelector, argc, argv, 0);
                         // Lookup node again, since the nodetable it was in may have been reallocated
-                        curNode = _s->_segMan->lookupNode(curAddress);
+                        // BUT only if there is in fact a new node [this fixes crash on arrival on island in LSL2] (2of1)
+                        if (_s->_segMan->lookupNode(curAddress))
+                                curNode = _s->_segMan->lookupNode(curAddress);
                 }
+
                 curAddress = curNode->succ;
                 curNode = _s->_segMan->lookupNode(curAddress);
         }