From b619c6ce1904dd814781ca601e04a36d40a3cedd Mon Sep 17 00:00:00 2001 From: Bertrand Augereau Date: Thu, 15 May 2008 08:50:47 +0000 Subject: NDS: Protection against FastRam (ITCM) allocation failure svn-id: r32136 --- backends/platform/ds/arm9/source/dsmain.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'backends/platform') diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index d11e4e6f75..55ec5004c4 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -2364,9 +2364,13 @@ u8 fastRamData[FAST_RAM_SIZE] ITCM_DATA; 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() { -- cgit v1.2.3