Mifare Fuzzer: Fix crash on unsupported card type loaded (#16)

Next-Flip · Aug 23, 2024 · 9a453c5 · 9a453c5
1 parent 70fae8d
commit 9a453c5
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/mifare_fuzzer/mifare_fuzzer_i.h b/mifare_fuzzer/mifare_fuzzer_i.h
@@ -80,4 +80,6 @@ struct MifareFuzzerApp {
     FuriString* uid_file_path;
     FuriString* uid_str;
     Stream* uids_stream;
+
+    bool nfc_device_parsed;
 };
diff --git a/mifare_fuzzer/scenes/mifare_fuzzer_scene_emulator.c b/mifare_fuzzer/scenes/mifare_fuzzer_scene_emulator.c
@@ -80,33 +80,13 @@ bool mifare_fuzzer_scene_emulator_on_event(void* context, SceneManagerEvent even
             NfcDevice* nfc_device = NULL;
             bool nfc_device_parsed = false;
             if(app->card_file_path) {
-                nfc_device = app->worker->nfc_device;
-                const char* path = furi_string_get_cstr(app->card_file_path);
-                if(nfc_device_load(nfc_device, path)) {
-                    nfc_device_parsed = true;
-                    NfcProtocol protocol = nfc_device_get_protocol(nfc_device);
-                    if(protocol == NfcProtocolMfClassic) {
-                        const MfClassicData* mfc_data = nfc_device_get_data(nfc_device, protocol);
-                        if(mfc_data->type == MfClassicType1k) {
-                            app->card = MifareCardClassic1k;
-                        } else if(mfc_data->type == MfClassicType4k) {
-                            app->card = MifareCardClassic4k;
-                        } else {
-                            nfc_device_parsed = false;
-                        }
-                    } else if(protocol == NfcProtocolMfUltralight) {
-                        app->card = MifareCardUltralight;
-                    }
-                    if(nfc_device_parsed) {
-                        mifare_fuzzer_emulator_set_card(emulator, app->card, app->card_file_path);
-                    }
-                }
             }
 
             Iso14443_3aData* nfc_data = iso14443_3a_alloc();
-            if(nfc_device_parsed) {
+            if(app->nfc_device_parsed) {
                 iso14443_3a_copy(
-                    nfc_data, nfc_device_get_data(nfc_device, NfcProtocolIso14443_3a));
+                    nfc_data,
+                    nfc_device_get_data(app->worker->nfc_device, NfcProtocolIso14443_3a));
             }
 
             // Stop worker

diff --git a/mifare_fuzzer/scenes/mifare_fuzzer_scene_start.c b/mifare_fuzzer/scenes/mifare_fuzzer_scene_start.c
@@ -90,6 +90,7 @@ bool mifare_fuzzer_scene_start_on_event(void* context, SceneManagerEvent event)
     if(event.type == SceneManagerEventTypeCustom) {
         //FURI_LOG_D(TAG, "mifare_fuzzer_scene_start_on_event() :: event.event = %ld", event.event);
         app->card_file_path = NULL;
+        app->nfc_device_parsed = false;
         if(event.event == MifareFuzzerEventClassic1k) {
             // save selected item
             scene_manager_set_scene_state(
@@ -135,8 +136,35 @@ bool mifare_fuzzer_scene_start_on_event(void* context, SceneManagerEvent event)
                 app->dialogs, app->card_file_path, initial_path, &browser_options);
             furi_string_free(initial_path);
             if(wasFileSelected) {
-                // open next scene
-                scene_manager_next_scene(app->scene_manager, MifareFuzzerSceneAttack);
+                MifareFuzzerEmulator* emulator = app->emulator_view;
+                NfcDevice* nfc_device = app->worker->nfc_device;
+                const char* path = furi_string_get_cstr(app->card_file_path);
+                if(nfc_device_load(nfc_device, path)) {
+                    app->nfc_device_parsed = true;
+                    NfcProtocol protocol = nfc_device_get_protocol(nfc_device);
+                    if(protocol == NfcProtocolMfClassic) {
+                        const MfClassicData* mfc_data = nfc_device_get_data(nfc_device, protocol);
+                        if(mfc_data->type == MfClassicType1k) {
+                            app->card = MifareCardClassic1k;
+                        } else if(mfc_data->type == MfClassicType4k) {
+                            app->card = MifareCardClassic4k;
+                        } else {
+                            app->nfc_device_parsed = false;
+                        }
+                    } else if(protocol == NfcProtocolMfUltralight) {
+                        app->card = MifareCardUltralight;
+                    } else {
+                        app->nfc_device_parsed = false;
+                    }
+                    if(app->nfc_device_parsed) {
+                        mifare_fuzzer_emulator_set_card(emulator, app->card, app->card_file_path);
+                        scene_manager_next_scene(app->scene_manager, MifareFuzzerSceneAttack);
+                    } else {
+                        app->card = MifareCardUnsupported;
+                        mifare_fuzzer_emulator_set_card(emulator, MifareCardUnsupported, NULL);
+                        scene_manager_next_scene(app->scene_manager, MifareFuzzerSceneEmulator);
+                    }
+                }
                 consumed = true;
             }
         }

diff --git a/mifare_fuzzer/views/mifare_fuzzer_emulator.c b/mifare_fuzzer/views/mifare_fuzzer_emulator.c
@@ -223,6 +223,9 @@ void mifare_fuzzer_emulator_set_card(
                 case MifareCardUltralight:
                     model->mifare_card_dsc = "Ultralight";
                     break;
+                case MifareCardUnsupported:
+                    model->mifare_card_dsc = "Unsupported Card!";
+                    break;
                 }
             } else {
                 FuriString* card_name = furi_string_alloc_set(name);

diff --git a/mifare_fuzzer/views/mifare_fuzzer_emulator.h b/mifare_fuzzer/views/mifare_fuzzer_emulator.h
@@ -14,6 +14,7 @@ typedef enum MifareCard {
     MifareCardClassic1k = 1,
     MifareCardClassic4k,
     MifareCardUltralight,
+    MifareCardUnsupported,
 } MifareCard;
 
 typedef enum MifareFuzzerAttack {