mirrors/flipperzero-firmware
1
Fork 0
mirror of https://github.com/flipperdevices/flipperzero-firmware.git synced 2025-12-12 04:41:26 +04:00
Code Issues Activity

Loader: Fix BusFault in handling of OOM (#3992)

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

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
WillyJL
2024-12-18 22:33:59 +01:00
committed by GitHub
parent 9c96bbfc54
commit a7b3a13581
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
furi/core/memmgr.c
View File

@@ -106,5 +106,7 @@ void* aligned_malloc(size_t size, size_t alignment) {
} }
void aligned_free(void* p) { void aligned_free(void* p) {
free(((void**)p)[-1]); if(p) {
free(((void**)p)[-1]);
}
} }

12
lib/flipper_application/elf/elf_file.c
View File

@@ -8,11 +8,11 @@
#define TAG "Elf" #define TAG "Elf"
#define ELF_NAME_BUFFER_LEN 32 #define ELF_NAME_BUFFER_LEN 32
#define SECTION_OFFSET(e, n) ((e)->section_table + (n) * sizeof(Elf32_Shdr)) #define SECTION_OFFSET(e, n) ((e)->section_table + (n) * sizeof(Elf32_Shdr))
#define IS_FLAGS_SET(v, m) (((v) & (m)) == (m)) #define IS_FLAGS_SET(v, m) (((v) & (m)) == (m))
#define RESOLVER_THREAD_YIELD_STEP 30 #define RESOLVER_THREAD_YIELD_STEP 30
#define FAST_RELOCATION_VERSION 1 #define FAST_RELOCATION_VERSION 1
// #define ELF_DEBUG_LOG 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); for(ELFSectionDict_it(it, elf->sections); !ELFSectionDict_end_p(it);
ELFSectionDict_next(it)) { ELFSectionDict_next(it)) {
const ELFSectionDict_itref_t* itref = ELFSectionDict_cref(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) { if(itref->value.fast_rel) {
aligned_free(itref->value.fast_rel->data); aligned_free(itref->value.fast_rel->data);
free(itref->value.fast_rel); free(itref->value.fast_rel);