[Scummvm-cvs-logs] scummvm master -> ff62a6050aedca96e69cb284c5406833e59ca588

[lskovlun]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ff62a6050a Revert "SCI: Don't attempt to modify null/disposed objects."


Commit: ff62a6050aedca96e69cb284c5406833e59ca588
    https://github.com/scummvm/scummvm/commit/ff62a6050aedca96e69cb284c5406833e59ca588
Author: Lars Skovlund (lskovlun at sprogklog.dk)
Date: 2011-05-27T04:15:57-07:00

Commit Message:
Revert "SCI: Don't attempt to modify null/disposed objects."
This fix for bug #3303802 is a potential cause of unreproducible bugs
in all SCI games that taint savegames.
This reverts commit 48140a012d69d76de5ae80de7ca926e71c39cd03.

Changed paths:
    engines/sci/engine/vm.cpp



diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index af34e6d..4995749 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -297,13 +297,6 @@ ExecStack *send_selector(EngineState *s, reg_t send_obj, reg_t work_obj, StackPt
 		if (argc > 0x800)	// More arguments than the stack could possibly accomodate for
 			error("send_selector(): More than 0x800 arguments to function call");
 
-		if (send_obj.isNull()) {
-			warning("Attempt to invoke a selector of a null/disposed object. Ignoring call");
-			framesize -= (2 + argc);
-			argp += argc + 1;
-			continue;
-		}
-
 		SelectorType selectorType = lookupSelector(s->_segMan, send_obj, selector, &varp, &funcp);
 		if (selectorType == kSelectorNone)
 			error("Send to invalid selector 0x%x of object at %04x:%04x", 0xffff & selector, PRINT_REG(send_obj));