[Scummvm-cvs-logs] SF.net SVN: scummvm:[38449] scummvm/trunk/engines/sci/scicore/resource.cpp

[aquadran at users.sourceforge.net]

Revision: 38449
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38449&view=rev
Author:   aquadran
Date:     2009-02-17 21:18:11 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
don't attempt display resource type name if it's out of array, so it give access violation

Modified Paths:
--------------
    scummvm/trunk/engines/sci/scicore/resource.cpp

Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp	2009-02-17 21:02:47 UTC (rev 38448)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp	2009-02-17 21:18:11 UTC (rev 38449)
@@ -25,6 +25,8 @@
 
 /* Resource library */
 
+#include "common/util.h"
+
 #include "sci/include/sci_memory.h"
 #include "sci/include/sciresource.h"
 #include "sci/include/vocabulary.h" /* For SCI version auto-detection */
@@ -883,9 +885,10 @@
 void
 scir_unlock_resource(resource_mgr_t *mgr, resource_t *res, int resnum, int restype) {
 	if (!res) {
-		sciprintf("Resmgr: Warning: Attempt to unlock non-existant"
-		          " resource %s.%03d!\n",
-		          sci_resource_types[restype], resnum);
+		if (restype >= ARRAYSIZE(sci_resource_types))
+			sciprintf("Resmgr: Warning: Attempt to unlock non-existant resource %03d.%03d!\n", restype, resnum);
+		else
+			sciprintf("Resmgr: Warning: Attempt to unlock non-existant resource %s.%03d!\n", sci_resource_types[restype], resnum);
 		return;
 	}
 


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