Sync with main

paxo-phone · Oct 25, 2024 · 98d2aa8 · 98d2aa8
1 parent 76f5bf3
commit 98d2aa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/lua/src/lua_file.cpp b/lib/lua/src/lua_file.cpp
@@ -80,13 +80,15 @@ void* custom_allocator(void *ud, void *ptr, size_t osize, size_t nsize) {
             free(ptr);
         }
         return NULL;
-    } else {
-        // Allocate or resize the block
-        #ifdef ESP_PLATFORM
-            return ps_realloc(ptr, nsize);
-        #else
-            return realloc(ptr, nsize);
-        #endif
+    }
+    else
+    {
+// Allocate or resize the block
+#ifdef ESP32
+        return ps_realloc(ptr, nsize);
+#else
+        return realloc(ptr, nsize);
+#endif
     }
 }
 

diff --git a/lib/system/libsystem.cpp b/lib/system/libsystem.cpp
@@ -98,6 +98,7 @@ void libsystem::panic(const std::string &message, const bool restart) {
 
     // Backtrace
 
+    // backtrace_saver::re_restart_debug_t backtraceData = backtrace_saver::getCurrentBacktrace();
     std::string fullBacktraceData;
 
     std::cerr << "Backtrace:" << std::endl;