merge upcoming changes

2026-05-23 05:24:46 -07:00 · 2024-04-08 04:10:00 +03:00
parent 3baa9e65e1
commit e895ba0c89
3 changed files with 9 additions and 5 deletions
--- a/furi/core/memmgr_heap.c
+++ b/furi/core/memmgr_heap.c
@@ -187,7 +187,11 @@ void* pvPortMalloc(size_t xSize) {
    // allocate block
    void* data = tlsf_malloc(tlsf, xSize);
    if(data == NULL) {
-        furi_crash("out of memory");
+        if(xSize == 0) {
+            furi_crash("malloc(0)");
+        } else {
+            furi_crash("out of memory");
+        }
    }

    // update heap usage