Browse Source

Crash fixes

tcpassos 2 years ago
parent
commit
6c0126695f

+ 3 - 1
applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c

@@ -142,7 +142,7 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
         }
         }
 
 
         // Run the script if the file with the script has been opened
         // Run the script if the file with the script has been opened
-        if(app->script) {
+        if(app->script != NULL) {
             app->script_worker = wifi_marauder_script_worker_alloc();
             app->script_worker = wifi_marauder_script_worker_alloc();
             wifi_marauder_script_worker_start(app->script_worker, app->script);
             wifi_marauder_script_worker_start(app->script_worker, app->script);
         }
         }
@@ -178,7 +178,9 @@ void wifi_marauder_scene_console_output_on_exit(void* context) {
     wifi_marauder_uart_set_handle_rx_data_cb(app->lp_uart, NULL);
     wifi_marauder_uart_set_handle_rx_data_cb(app->lp_uart, NULL);
 
 
     wifi_marauder_script_worker_free(app->script_worker);
     wifi_marauder_script_worker_free(app->script_worker);
+    app->script_worker = NULL;
     wifi_marauder_script_free(app->script);
     wifi_marauder_script_free(app->script);
+    app->script = NULL;
 
 
     app->is_writing_pcap = false;
     app->is_writing_pcap = false;
     if(app->capture_file && storage_file_is_open(app->capture_file)) {
     if(app->capture_file && storage_file_is_open(app->capture_file)) {

+ 1 - 1
applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c

@@ -127,7 +127,7 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
     {"Update", {"ota", "sd"}, 2, {"update -w", "update -s"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Update", {"ota", "sd"}, 2, {"update -w", "update -s"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Reboot", {""}, 1, {"reboot"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Reboot", {""}, 1, {"reboot"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Help", {""}, 1, {"help"}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
     {"Help", {""}, 1, {"help"}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
-    {"Run script", {""}, 1, {""}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
+    {"Scripts", {""}, 1, {""}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Save to flipper sdcard", // keep as last entry or change logic in callback below
     {"Save to flipper sdcard", // keep as last entry or change logic in callback below
      {""},
      {""},
      1,
      1,

+ 1 - 1
applications/external/wifi_marauder_companion/script/wifi_marauder_script.c

@@ -47,7 +47,7 @@ void _wifi_marauder_script_load_meta(WifiMarauderScript *script, cJSON *meta_sec
         }
         }
     }
     }
     if (script->description == NULL) {
     if (script->description == NULL) {
-        script->description = "My script";
+        script->description = strdup("My script");
     }
     }
 }
 }