From a7b3a135815f403006b52ba55d7e82234378a596 Mon Sep 17 00:00:00 2001
From: WillyJL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:33:59 +0100
Subject: [PATCH] Loader: Fix BusFault in handling of OOM (#3992)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Loader: Fix BusFault in handling of OOM
* Furi: fix crash in aligned_alloc, cleanup aligned_alloc use

Co-authored-by: あく <alleteam@gmail.com>
---
 furi/core/memmgr.c                     |  4 +++-
 lib/flipper_application/elf/elf_file.c | 12 +++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/furi/core/memmgr.c b/furi/core/memmgr.c
index d3ff873ae50..8ee0d1723b7 100644
--- a/furi/core/memmgr.c
+++ b/furi/core/memmgr.c
@@ -106,5 +106,7 @@ void* aligned_malloc(size_t size, size_t alignment) {
 }
 
 void aligned_free(void* p) {
-    free(((void**)p)[-1]);
+    if(p) {
+        free(((void**)p)[-1]);
+    }
 }
diff --git a/lib/flipper_application/elf/elf_file.c b/lib/flipper_application/elf/elf_file.c
index d0c4f52fb1f..bd8ecdf7ef3 100644
--- a/lib/flipper_application/elf/elf_file.c
+++ b/lib/flipper_application/elf/elf_file.c
@@ -8,11 +8,11 @@
 
 #define TAG "Elf"
 
-#define ELF_NAME_BUFFER_LEN 32
-#define SECTION_OFFSET(e, n) ((e)->section_table + (n) * sizeof(Elf32_Shdr))
-#define IS_FLAGS_SET(v, m) (((v) & (m)) == (m))
+#define ELF_NAME_BUFFER_LEN        32
+#define SECTION_OFFSET(e, n)       ((e)->section_table + (n) * sizeof(Elf32_Shdr))
+#define IS_FLAGS_SET(v, m)         (((v) & (m)) == (m))
 #define RESOLVER_THREAD_YIELD_STEP 30
-#define FAST_RELOCATION_VERSION 1
+#define FAST_RELOCATION_VERSION    1
 
 // #define ELF_DEBUG_LOG 1
 
@@ -830,9 +830,7 @@ void elf_file_free(ELFFile* elf) {
         for(ELFSectionDict_it(it, elf->sections); !ELFSectionDict_end_p(it);
             ELFSectionDict_next(it)) {
             const ELFSectionDict_itref_t* itref = ELFSectionDict_cref(it);
-            if(itref->value.data) {
-                aligned_free(itref->value.data);
-            }
+            aligned_free(itref->value.data);
             if(itref->value.fast_rel) {
                 aligned_free(itref->value.fast_rel->data);
                 free(itref->value.fast_rel);