[Scummvm-cvs-logs] SF.net SVN: scummvm:[53503] scummvm/trunk/engines/agos

[thebluegr at users.sourceforge.net]

Revision: 53503
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53503&view=rev
Author:   thebluegr
Date:     2010-10-15 15:23:53 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
AGOS: Fixed code analysis warnings - bug #3087828

Modified Paths:
--------------
    scummvm/trunk/engines/agos/script_pn.cpp
    scummvm/trunk/engines/agos/verb_pn.cpp

Modified: scummvm/trunk/engines/agos/script_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_pn.cpp	2010-10-15 15:17:49 UTC (rev 53502)
+++ scummvm/trunk/engines/agos/script_pn.cpp	2010-10-15 15:23:53 UTC (rev 53503)
@@ -890,7 +890,7 @@
 	int myTag = ++_tagOfActiveDoline;	// Obtain a unique tag for this doline invocation
 	_dolineReturnVal = 0;
 
-	if (needsave)
+	if (_stackbase && needsave)
 		_stackbase->tagOfParentDoline = myTag;
 
 	do {

Modified: scummvm/trunk/engines/agos/verb_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb_pn.cpp	2010-10-15 15:17:49 UTC (rev 53502)
+++ scummvm/trunk/engines/agos/verb_pn.cpp	2010-10-15 15:23:53 UTC (rev 53503)
@@ -185,7 +185,7 @@
 
 	_mousePrintFG++;
 	_mouseString = (const char *)"take \0";
-	_mouseString1 = getMessage(_objectName1, _dragStore->msg1);
+	_mouseString1 = _dragStore ? getMessage(_objectName1, _dragStore->msg1) : "";
 
 	if (_dragStore->flags & kOBFRoomBox)
 		_mouseString1 = (const char *)"all\r";


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