[Scummvm-cvs-logs] SF.net SVN: scummvm: [32136] scummvm/trunk/backends/platform/ds/arm9/source /dsmain.cpp

tramboi at users.sourceforge.net tramboi at users.sourceforge.net
Thu May 15 10:50:47 CEST 2008


Revision: 32136
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32136&view=rev
Author:   tramboi
Date:     2008-05-15 01:50:47 -0700 (Thu, 15 May 2008)

Log Message:
-----------
NDS: Protection against FastRam (ITCM) allocation failure

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2008-05-15 01:18:26 UTC (rev 32135)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2008-05-15 08:50:47 UTC (rev 32136)
@@ -2364,9 +2364,13 @@
 
 void* fastRamAlloc(int size) {
 //	return malloc(size);
-	void* result = (void *) fastRamPointer;
+	void* result = fastRamPointer;
 	fastRamPointer += size;
-	return (void *) (result);
+	if(fastRamPointer > fastRamData + FAST_RAM_SIZE) {
+		consolePrintf("FastRam (ITCM) allocation failed!\n");
+		return NULL;
+	}		
+	return result;
 }
 
 void fastRamReset() {


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