[Scummvm-cvs-logs] SF.net SVN: scummvm:[39724] scummvm/trunk/engines/parallaction/exec_br.cpp

[peres001 at users.sourceforge.net]

Revision: 39724
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39724&view=rev
Author:   peres001
Date:     2009-03-28 14:38:19 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
Added workaround for script bug in ticket #2718449.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_br.cpp

Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp	2009-03-28 14:17:17 UTC (rev 39723)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp	2009-03-28 14:38:19 UTC (rev 39724)
@@ -326,6 +326,12 @@
 }
 
 DECLARE_COMMAND_OPCODE(speak) {
+	// WORKAROUND: this avoids crashing when the zone is not parsed, like in the case
+	// of script bug in ticket #2718449.
+	if (!ctxt._cmd->u._zone) {
+		return;
+	}
+
 	if (ACTIONTYPE(ctxt._cmd->u._zone) == kZoneSpeak) {
 		_vm->enterDialogueMode(ctxt._cmd->u._zone);
 	} else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.