small fixes

Author: jaylikesbunda

CHANGELOG.md

@@ -6,6 +6,8 @@
 - Fixed a memory leak when showing the confirmation dialog
 - Fixed a memory leak when opening the settings menu
 - Fixed a potential memory leak on app exit
+- Added a warning to the IR Dazzler menu option for the Poltergeist board from rabbit-labs
+- Miscellaneous memory optimisations
 
 ## v1.6.2
 

src/app_state.h

@@ -70,7 +70,8 @@ struct AppState {
     FuriMutex* buffer_mutex;
     // UART Context
     UartContext* uart_context;
-    FilterConfig* filter_config;
+    // FilterConfig is small enough to embed directly
+    FilterConfig filter_config;
 
     // Settings
     Settings settings;

src/main.c

@@ -75,9 +75,8 @@ int32_t ghost_esp_app(void* p) {
     state->previous_view = 0;
     state->came_from_settings = false;
 
-    // Initialize essential text buffer (shared log/view buffer)
     state->textBoxBuffer = malloc(TEXT_LOG_BUFFER_SIZE);
-    if(state->textBoxBuffer) {
+    if(state && state->textBoxBuffer) {
         memset(state->textBoxBuffer, 0, TEXT_LOG_BUFFER_SIZE);
     }
     state->buffer_length = 0;
@@ -147,16 +146,13 @@ int32_t ghost_esp_app(void* p) {
     }
 
     // Initialize filter config
-    state->filter_config = malloc(sizeof(FilterConfig));
-    if(state->filter_config) {
-        state->filter_config->enabled = state->settings.enable_filtering_index;
-        state->filter_config->show_ble_status = true;
-        state->filter_config->show_wifi_status = true;
-        state->filter_config->show_flipper_devices = true;
-        state->filter_config->show_wifi_networks = true;
-        state->filter_config->strip_ansi_codes = true;
-        state->filter_config->add_prefixes = true;
-    }
+    state->filter_config.enabled = state->settings.enable_filtering_index;
+    state->filter_config.show_ble_status = true;
+    state->filter_config.show_wifi_status = true;
+    state->filter_config.show_flipper_devices = true;
+    state->filter_config.show_wifi_networks = true;
+    state->filter_config.strip_ansi_codes = true;
+    state->filter_config.add_prefixes = true;
 
     // Set up settings UI context
     state->settings_ui_context.settings = &state->settings;
@@ -295,6 +291,7 @@ int32_t ghost_esp_app(void* p) {
     // Clean up UART context (this will also handle storage cleanup)
     if(state && state->uart_context) {
         FURI_LOG_I("Ghost_ESP", "Freeing UART context...");
+        uart_cleanup_capture_streams(state->uart_context); // Ensure capture streams are freed
         uart_free(state->uart_context);
         state->uart_context = NULL;
         FURI_LOG_I("Ghost_ESP", "UART context freed.");
@@ -376,7 +373,7 @@ int32_t ghost_esp_app(void* p) {
     FURI_LOG_I("Ghost_ESP", "Freeing buffers...");
     if(state && state->input_buffer) free(state->input_buffer);
     if(state && state->textBoxBuffer) free(state->textBoxBuffer);
-    if(state && state->filter_config) free(state->filter_config);
+    // state->filter_config is now embedded, no need to free
     if(state && state->ir_file_buffer) free(state->ir_file_buffer);
     if(state && state->active_confirm_context) {
         FURI_LOG_I("Ghost_ESP", "Freeing active confirmation context...");

src/menu.c

@@ -2144,7 +2144,7 @@ static bool handle_ir_command_feedback_ex(
     char raw_buffer[512];
     size_t len = 0;
     char* message = state->confirmation_message;
-    char summary[96];
+    char summary[128];
     message[0] = '\0';
     summary[0] = '\0';
     raw_buffer[0] = '\0';
@@ -2278,6 +2278,11 @@ static bool handle_ir_command_feedback_ex(
                     }
 
                     if(saw_ok && summary[0] && !message[0]) {
+                        // Truncate summary if needed to prevent buffer overflow when combining
+                        size_t max_len = sizeof(state->confirmation_message) - 10; // Reserve space for "Send OK\n"
+                        if(strlen(summary) > max_len) {
+                            summary[max_len] = '\0';
+                        }
                         snprintf(
                             message,
                             sizeof(state->confirmation_message),
@@ -2303,6 +2308,11 @@ static bool handle_ir_command_feedback_ex(
                    strstr(line, "status OK") || strstr(line, "ir signal transmission complete")) {
                     saw_ok = true;
                     if(summary[0]) {
+                        // Truncate summary if needed
+                        size_t max_len = sizeof(state->confirmation_message) - 10;
+                        if(strlen(summary) > max_len) {
+                            summary[max_len] = '\0';
+                        }
                         snprintf(
                             message,
                             sizeof(state->confirmation_message),
@@ -2615,6 +2625,10 @@ static void execute_menu_command(AppState* state, const MenuCommand* command) {
         return;
     }
     if(strcmp(command->command, "send_ir_file") == 0) {
+        // Ensure capture streams are cleaned up before opening file browser
+        if(state->uart_context) {
+            uart_cleanup_capture_streams(state->uart_context);
+        }
         send_ir_file(state);
         return;
     }
@@ -3395,9 +3409,10 @@ bool back_event_callback(void* context) {
         }
         FURI_LOG_D("Ghost ESP", "Handling text box view exit");
 
-        // Cleanup text buffer
+        // Cleanup text buffer and capture streams
         if(state->uart_context) {
             uart_reset_text_buffers(state->uart_context);
+            uart_cleanup_capture_streams(state->uart_context);
         }
         if(state->textBoxBuffer) {
             state->buffer_length = 0;

src/settings_ui.c

@@ -211,9 +211,7 @@ bool settings_set(Settings* settings, SettingKey key, uint8_t value, void* conte
                 SettingsUIContext* settings_context = (SettingsUIContext*)context;
                 if(settings_context->context) {
                     AppState* app_state = (AppState*)settings_context->context;
-                    if(app_state->filter_config) {
-                        app_state->filter_config->enabled = value;
-                    }
+                    app_state->filter_config.enabled = value;
                 }
             }
             changed = true;

src/uart_utils.c

@@ -738,6 +738,33 @@ bool uart_is_esp_connected(UartContext* uart) {
     return connected;
 }
 
+void uart_cleanup_capture_streams(UartContext* uart) {
+    if(!uart) return;
+
+    if(uart->is_serial_active) {
+        furi_hal_serial_async_rx_stop(uart->serial_handle);
+    }
+
+    if(uart->pcap_stream) {
+        furi_stream_buffer_free(uart->pcap_stream);
+        uart->pcap_stream = NULL;
+        FURI_LOG_I("UART", "Freed PCAP stream on exit");
+    }
+    if(uart->csv_stream) {
+        furi_stream_buffer_free(uart->csv_stream);
+        uart->csv_stream = NULL;
+        FURI_LOG_I("UART", "Freed CSV stream on exit");
+    }
+
+    uart->pcap = false;
+    uart->csv = false;
+    uart->pcap_flush_pending = false;
+
+    if(uart->is_serial_active) {
+        furi_hal_serial_async_rx_start(uart->serial_handle, uart_rx_callback, uart, false);
+    }
+}
+
 bool uart_receive_data(
     UartContext* uart,
     ViewDispatcher* view_dispatcher,

src/uart_utils.h

@@ -23,7 +23,7 @@
 
 #define BAUDRATE (115200)
 
-#define TEXT_BOX_STORE_SIZE           (12 * 1024) // 12KB text box buffer size
+#define TEXT_BOX_STORE_SIZE           (8 * 1024) // 8KB text box buffer size
 #define RX_BUF_SIZE                   2048
 #define PCAP_BUF_SIZE                 4096
 #define GHOST_ESP_APP_FOLDER          "/ext/apps_data/ghost_esp"
@@ -113,6 +113,7 @@ void uart_storage_safe_cleanup(UartStorageContext* ctx);
 void uart_reset_text_buffers(UartContext* uart);
 bool uart_copy_text_buffer(UartContext* uart, char* out, size_t out_size, size_t* out_len);
 bool uart_copy_text_buffer_tail(UartContext* uart, char* out, size_t out_size, size_t* out_len);
+void uart_cleanup_capture_streams(UartContext* uart);
 
 #endif