[Scummvm-cvs-logs] SF.net SVN: scummvm:[44484] scummvm/trunk/engines/sci/engine/kstring.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Sep 30 15:09:19 CEST 2009


Revision: 44484
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44484&view=rev
Author:   thebluegr
Date:     2009-09-30 13:09:18 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
Fixed a crash when starting KQ1SCI

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kstring.cpp

Modified: scummvm/trunk/engines/sci/engine/kstring.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.cpp	2009-09-30 13:07:12 UTC (rev 44483)
+++ scummvm/trunk/engines/sci/engine/kstring.cpp	2009-09-30 13:09:18 UTC (rev 44484)
@@ -447,7 +447,7 @@
 			switch (xfer) {
 			case 's': { /* Copy string */
 				reg_t reg = argv[startarg + paramindex];
-				Common::String tempsource = kernel_lookup_text(s, reg,
+				Common::String tempsource = (reg == NULL_REG) ? "" : kernel_lookup_text(s, reg,
 				                                  arguments[paramindex + 1]);
 				int slen = strlen(tempsource.c_str());
 				int extralen = str_leng - slen;


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




More information about the Scummvm-git-logs mailing list