From f7d5f0f8f197791a5729c91f9b96adf201a18e08 Mon Sep 17 00:00:00 2001
From: Rhys Mainwaring <rhys.mainwaring@me.com>
Date: Sat, 4 Jan 2025 19:38:59 +0000
Subject: [PATCH] AP_MultiHeap: initialize only if heap allocation succeeded

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
---
 libraries/AP_MultiHeap/MultiHeap_malloc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/AP_MultiHeap/MultiHeap_malloc.cpp b/libraries/AP_MultiHeap/MultiHeap_malloc.cpp
index 857d01e76b..089f376649 100644
--- a/libraries/AP_MultiHeap/MultiHeap_malloc.cpp
+++ b/libraries/AP_MultiHeap/MultiHeap_malloc.cpp
@@ -36,9 +36,9 @@ void *MultiHeap::heap_create(uint32_t size)
 {
     struct heap *new_heap = (struct heap*)malloc(sizeof(struct heap));
     if (new_heap != nullptr) {
+        new_heap->magic = HEAP_MAGIC;
         new_heap->max_heap_size = size;
     }
-    new_heap->magic = HEAP_MAGIC;
     return (void *)new_heap;
 }