Merge pull request #448 from alecoding/malloc_alignment

Fix malloc alignment (Thanks @alecoding )

extras/fixture/src/unity_fixture.c

@@ -188,13 +188,26 @@ typedef struct GuardBytes
 } Guard;
 
 
+#define UNITY_MALLOC_ALIGNMENT (UNITY_POINTER_WIDTH / 8)
 static const char end[] = "END";
 
+
+static size_t unity_size_round_up(size_t size)
+{
+    size_t rounded_size;
+
+    rounded_size = ((size + UNITY_MALLOC_ALIGNMENT - 1) / UNITY_MALLOC_ALIGNMENT) * UNITY_MALLOC_ALIGNMENT;
+
+    return rounded_size;
+}
+
 void* unity_malloc(size_t size)
 {
     char* mem;
     Guard* guard;
-    size_t total_size = size + sizeof(Guard) + sizeof(end);
+    size_t total_size;
+
+    total_size = sizeof(Guard) + unity_size_round_up(size + sizeof(end));
 
     if (malloc_fail_countdown != MALLOC_DONT_FAIL)
     {
@@ -243,9 +256,15 @@ static void release_memory(void* mem)
 
     malloc_count--;
 #ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    if (mem == unity_heap + heap_index - guard->size - sizeof(end))
     {
-        heap_index -= (guard->size + sizeof(Guard) + sizeof(end));
+        size_t block_size;
+
+        block_size = unity_size_round_up(guard->size + sizeof(end));
+
+        if (mem == unity_heap + heap_index - block_size)
+        {
+            heap_index -= (sizeof(Guard) + block_size);
+        }
     }
 #else
     UNITY_FIXTURE_FREE(guard);
@@ -300,11 +319,15 @@ void* unity_realloc(void* oldMem, size_t size)
     if (guard->size >= size) return oldMem;
 
 #ifdef UNITY_EXCLUDE_STDLIB_MALLOC /* Optimization if memory is expandable */
-    if (oldMem == unity_heap + heap_index - guard->size - sizeof(end) &&
-        heap_index + size - guard->size <= UNITY_INTERNAL_HEAP_SIZE_BYTES)
     {
-        release_memory(oldMem);    /* Not thread-safe, like unity_heap generally */
-        return unity_malloc(size); /* No memcpy since data is in place */
+        size_t old_total_size = unity_size_round_up(guard->size + sizeof(end));
+
+        if ((oldMem == unity_heap + heap_index - old_total_size) &&
+            ((heap_index - old_total_size + unity_size_round_up(size + sizeof(end))) <= UNITY_INTERNAL_HEAP_SIZE_BYTES))
+        {
+            release_memory(oldMem);    /* Not thread-safe, like unity_heap generally */
+            return unity_malloc(size); /* No memcpy since data is in place */
+        }
     }
 #endif
     newMem = unity_malloc(size);