Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-26 05:54:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Moar memory management crashes.

Browse Source
This commit is contained in:
SG
2022-11-15 23:58:36 +10:00
parent 2198a38a22
commit c832ad6d1f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/targets/f7/furi_hal/furi_hal_memory.c
View File

@@ -81,6 +81,10 @@ void furi_hal_memory_init() {
} }
void* furi_hal_memory_alloc(size_t size) { void* furi_hal_memory_alloc(size_t size) {
if(FURI_IS_ISR()) {
furi_crash("memmgt in ISR");
}
if(furi_hal_memory == NULL) { if(furi_hal_memory == NULL) {
return NULL; return NULL;
} }

6
furi/core/memmgr_heap.c
View File

@@ -341,7 +341,7 @@ void* pvPortMalloc(size_t xWantedSize) {
size_t to_wipe = xWantedSize; size_t to_wipe = xWantedSize;
if(FURI_IS_ISR()) { if(FURI_IS_ISR()) {
furi_crash("malloc in ISR"); furi_crash("memmgt in ISR");
} }
#ifdef HEAP_PRINT_DEBUG #ifdef HEAP_PRINT_DEBUG
@@ -490,6 +490,10 @@ void vPortFree(void* pv) {
uint8_t* puc = (uint8_t*)pv; uint8_t* puc = (uint8_t*)pv;
BlockLink_t* pxLink; BlockLink_t* pxLink;
if(FURI_IS_ISR()) {
furi_crash("memmgt in ISR");
}
if(pv != NULL) { if(pv != NULL) {
/* The memory being freed will have an BlockLink_t structure immediately /* The memory being freed will have an BlockLink_t structure immediately
before it. */ before it. */