Changeset 1751

Timestamp:

07/31/10 19:21:13 (6 weeks ago)

Author:

axel

Message:

branches/bmx-0.3.x/allocate.c debugMalloc/Free/Realloc: quick arm9 fix changing trailing magicNumber to char

Files:

• branches/bmx-0.3.x/allocate.c (modified) (13 diffs)

branches/bmx-0.3.x/allocate.c

@@ -28 +28 @@
 
 
-#define MAGIC_NUMBER 0x12345678
+#define MAGIC_NUMBER_HEADER 0x12345678
+#define MAGIC_NUMBER_TRAILOR 0x12
 
 #if defined DEBUG_MALLOC
@@ -40 +41 @@
         uint32_t length;
         int32_t tag;
-        uint32_t magicNumber;
+        uint32_t magicNumberHeader;
 };
 
-struct chunkTrailer
-{
-        uint32_t magicNumber;
-};
+typedef unsigned char magicNumberTrailor;
+
 
 
@@ -153 +152 @@
 {
         struct chunkHeader *walker;
-        struct chunkTrailer *chunkTrailer;
+        magicNumberTrailor *chunkTrailer;
         unsigned char *memory;
 
@@ -159 +158 @@
         for (walker = chunkList; walker != NULL; walker = walker->next)
         {
-                if (walker->magicNumber != MAGIC_NUMBER)
+                if (walker->magicNumberHeader != MAGIC_NUMBER_HEADER)
                 {
                         dbgf( DBGL_SYS, DBGT_ERR, 
                              "invalid magic number in header: %08x, malloc tag = %d", 
-                             walker->magicNumber, walker->tag );
+                             walker->magicNumberHeader, walker->tag );
                         cleanup_all( -500073 );
                 }
@@ -169 +168 @@
                 memory = (unsigned char *)walker;
 
-                chunkTrailer = (struct chunkTrailer *)(memory + sizeof(struct chunkHeader) + walker->length);
-
-                if (chunkTrailer->magicNumber != MAGIC_NUMBER)
-                {
-                        dbgf( DBGL_SYS, DBGT_ERR, 
-                             "invalid magic number in trailer: %08x, malloc tag = %d", 
-                             chunkTrailer->magicNumber, walker->tag );
-                        cleanup_all( -500075 );
-                }
-        }
+                chunkTrailer = (magicNumberTrailor*)(memory + sizeof(struct chunkHeader) + walker->length);
+
+                if (*chunkTrailer != MAGIC_NUMBER_TRAILOR)
+{
+                        dbgf(DBGL_SYS, DBGT_ERR,
+                                "invalid magic number in trailer: %08x, malloc tag = %d",
+                                *chunkTrailer, walker->tag);
+                        cleanup_all(-500075);
+                }
+        }
 
 }
@@ -208 +207 @@
         unsigned char *memory;
         struct chunkHeader *chunkHeader;
-        struct chunkTrailer *chunkTrailer;
+        magicNumberTrailor *chunkTrailer;
         unsigned char *chunk;
 
-        memory = malloc(length + sizeof(struct chunkHeader) + sizeof(struct chunkTrailer));
+        memory = malloc(length + sizeof(struct chunkHeader) + sizeof(magicNumberTrailor));
 
         if (memory == NULL)
         {
                 dbg( DBGL_SYS, DBGT_ERR, "Cannot allocate %u bytes, malloc tag = %d", 
-                     (unsigned int)(length + sizeof(struct chunkHeader) + sizeof(struct chunkTrailer)), tag );
+                     (unsigned int)(length + sizeof(struct chunkHeader) + sizeof(magicNumberTrailor)), tag );
                 cleanup_all( -500076 );
         }
@@ -222 +221 @@
         chunkHeader = (struct chunkHeader *)memory;
         chunk = memory + sizeof(struct chunkHeader);
-        chunkTrailer = (struct chunkTrailer *)(memory + sizeof(struct chunkHeader) + length);
+        chunkTrailer = (magicNumberTrailor *) (memory + sizeof (struct chunkHeader) + length);
 
         chunkHeader->length = length;
         chunkHeader->tag = tag;
-        chunkHeader->magicNumber = MAGIC_NUMBER;
-
-        chunkTrailer->magicNumber = MAGIC_NUMBER;
+        chunkHeader->magicNumberHeader = MAGIC_NUMBER_HEADER;
+
+        *chunkTrailer = MAGIC_NUMBER_TRAILOR;
 
         chunkHeader->next = chunkList;
@@ -249 +248 @@
         unsigned char *memory;
         struct chunkHeader *chunkHeader=NULL;
-        struct chunkTrailer *chunkTrailer;
+        magicNumberTrailor *chunkTrailer;
         unsigned char *result;
         uint32_t copyLength;
@@ -257 +256 @@
                 chunkHeader = (struct chunkHeader *)(memory - sizeof(struct chunkHeader));
 
-                if (chunkHeader->magicNumber != MAGIC_NUMBER)
+                if (chunkHeader->magicNumberHeader != MAGIC_NUMBER_HEADER)
                 {
                         dbgf( DBGL_SYS, DBGT_ERR, 
                              "invalid magic number in header: %08x, malloc tag = %d", 
-                             chunkHeader->magicNumber, chunkHeader->tag );
+                             chunkHeader->magicNumberHeader, chunkHeader->tag );
                         cleanup_all( -500078 );
                 }
 
-                chunkTrailer = (struct chunkTrailer *)(memory + chunkHeader->length);
-
-                if (chunkTrailer->magicNumber != MAGIC_NUMBER)
+                chunkTrailer = (magicNumberTrailor *)(memory + chunkHeader->length);
+
+                if (*chunkTrailer != MAGIC_NUMBER_TRAILOR)
                 {
-                        dbgf( DBGL_SYS, DBGT_ERR, 
-                             "invalid magic number in trailer: %08x, malloc tag = %d", 
-                             chunkTrailer->magicNumber, chunkHeader->tag );
-                        cleanup_all( -500079 );
-                }
+                        dbgf( DBGL_SYS, DBGT_ERR,
+                                "invalid magic number in trailer: %08x, malloc tag = %d",
+                                *chunkTrailer, chunkHeader->tag);
+                        cleanup_all(-500079);
+                }
         }
 
@@ -298 +297 @@
         unsigned char *memory;
         struct chunkHeader *chunkHeader;
-        struct chunkTrailer *chunkTrailer;
+        magicNumberTrailor *chunkTrailer;
         struct chunkHeader *walker;
         struct chunkHeader *previous;
@@ -305 +304 @@
         chunkHeader = (struct chunkHeader *)(memory - sizeof(struct chunkHeader));
 
-        if (chunkHeader->magicNumber != MAGIC_NUMBER)
+        if (chunkHeader->magicNumberHeader != MAGIC_NUMBER_HEADER)
         {
                 dbgf( DBGL_SYS, DBGT_ERR, 
-                     "invalid magic number in header: %08x, malloc tag = %d, free tag = %d", 
-                     chunkHeader->magicNumber, chunkHeader->tag, tag );
+                     "invalid magic number in header: %08x, malloc tag = %d, free tag = %d, malloc size = %d",
+                     chunkHeader->magicNumberHeader, chunkHeader->tag, tag, chunkHeader->length );
                 cleanup_all( -500080 );
         }
@@ -325 +324 @@
         if (walker == NULL)
         {
-                dbg( DBGL_SYS, DBGT_ERR, "Double free detected, malloc tag = %d, free tag = %d", 
-                     chunkHeader->tag, tag );
+                dbg( DBGL_SYS, DBGT_ERR, "Double free detected, malloc tag = %d, free tag = %d, malloc size = %d",
+                     chunkHeader->tag, tag, chunkHeader->length );
                 cleanup_all( -500081 );
         }
@@ -337 +336 @@
 
 
-        chunkTrailer = (struct chunkTrailer *)(memory + chunkHeader->length);
-
-        if (chunkTrailer->magicNumber != MAGIC_NUMBER)
-        {
-                dbgf( DBGL_SYS, DBGT_ERR, 
-                     "invalid magic number in trailer: %08x, malloc tag = %d, free tag = %d",
-                     chunkTrailer->magicNumber, chunkHeader->tag, tag );
-                cleanup_all( -500082 );
+        chunkTrailer = (magicNumberTrailor *)(memory + chunkHeader->length);
+
+        if (*chunkTrailer != MAGIC_NUMBER_TRAILOR)
+{
+                dbgf(DBGL_SYS, DBGT_ERR,
+                        "invalid magic number in trailer: %08x, malloc tag = %d, free tag = %d, malloc size = %d",
+                        *chunkTrailer, chunkHeader->tag, tag, chunkHeader->length);
+                cleanup_all(-500082);
         }