Usermode/libc - Minor fix to memmove

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / heap.c

diff --git a/Usermode/Libraries/libc.so_src/heap.c b/Usermode/Libraries/libc.so_src/heap.c
index bdf64de..9b6799b 100644 (file)
--- a/Usermode/Libraries/libc.so_src/heap.c
+++ b/Usermode/Libraries/libc.so_src/heap.c
@@ -94,13 +94,16 @@ EXPORT void *malloc(size_t bytes)
                        //Corrupt Heap\r
                        Heap_Dump();\r
                        _SysDebug("malloc: Corrupt Heap\n");\r
+                       exit(128);\r
                        return NULL;\r
                }\r
                curBlock = (heap_head*)((uintptr_t)curBlock + curBlock->size);\r
        }\r
        \r
        if((uintptr_t)curBlock < (uintptr_t)_heap_start) {\r
+               Heap_Dump();\r
                _SysDebug("malloc: Heap underrun for some reason\n");\r
+               exit(128);\r
                return NULL;\r
        }\r
        \r
@@ -174,7 +177,7 @@ EXPORT void *calloc(size_t __nmemb, size_t __size)
 EXPORT void free(void *mem)\r
 {\r
        heap_head       *head = (void*)((intptr_t)mem-sizeof(heap_head));\r
-       \r
+\r
        // Sanity please!\r
        if(!mem)        return;\r
        \r
@@ -450,17 +453,15 @@ void Heap_Dump(void)
        heap_head *cur = _heap_start;\r
        while( cur < (heap_head*)_heap_end )\r
        {\r
-               switch( cur->magic )\r
-               {\r
-               case MAGIC:\r
+               if( cur->magic == MAGIC ) {\r
                        _SysDebug("Used block %p[0x%x] - ptr=%p", cur, cur->size, cur->data);\r
-                       break;\r
-               case MAGIC_FREE:\r
+               }\r
+               else if( cur->magic == MAGIC_FREE ) {\r
                        _SysDebug("Free block %p[0x%x] - ptr=%p", cur, cur->size, cur->data);\r
-                       break;\r
-               default:\r
+               }\r
+               else {\r
                        _SysDebug("Block %p bad magic (0x%x)", cur, cur->magic);\r
-                       return ;\r
+                       break ;\r
                }\r
                cur = (void*)( (char*)cur + cur->size );\r
        }\r