diff options
| author | Lars Skovlund | 2011-05-27 13:15:57 +0200 |
|---|---|---|
| committer | Lars Skovlund | 2011-05-27 13:15:57 +0200 |
| commit | ff62a6050aedca96e69cb284c5406833e59ca588 (patch) | |
| tree | 3dedb3fa7db2c317a885fe8a22050123fbc67ff3 | |
| parent | d50c6277e41a5280e5fe02015d497d2d29603aa9 (diff) | |
| download | scummvm-rg350-ff62a6050aedca96e69cb284c5406833e59ca588.tar.gz scummvm-rg350-ff62a6050aedca96e69cb284c5406833e59ca588.tar.bz2 scummvm-rg350-ff62a6050aedca96e69cb284c5406833e59ca588.zip | |
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.
| -rw-r--r-- | engines/sci/engine/vm.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index af34e6d924..499574957e 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)); |