Skip to content

Fix nfc_protocol_support_scene_save_name_on_event crash #3418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hedger merged 3 commits into from
Feb 6, 2024
Merged

Fix nfc_protocol_support_scene_save_name_on_event crash #3418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ddb146
Add Clearing of detected protocols list in nfc_scene_start
xMasterX Feb 1, 2024
ad6d826
Apply patch
xMasterX Feb 6, 2024
97a1de7
Merge branch 'dev' into nfc_fix_merzkij_bug
hedger Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,7 @@ static bool
scene_manager_has_previous_scene(instance->scene_manager, NfcSceneSetType) ?
DolphinDeedNfcAddSave :
DolphinDeedNfcSave);
const NfcProtocol protocol =
instance->protocols_detected[instance->protocols_detected_selected_idx];
const NfcProtocol protocol = nfc_device_get_protocol(instance->nfc_device);
consumed = nfc_protocol_support[protocol]->scene_save_name.on_event(
instance, event.event);
} else {
Expand Down
2 changes: 2 additions & 0 deletions applications/main/nfc/scenes/nfc_scene_start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ void nfc_scene_start_on_enter(void* context) {
furi_string_reset(nfc->file_name);
nfc_device_clear(nfc->nfc_device);
iso14443_3a_reset(nfc->iso14443_3a_edit_data);
// Reset detected protocols list
nfc_app_reset_detected_protocols(nfc);

submenu_add_item(submenu, "Read", SubmenuIndexRead, nfc_scene_start_submenu_callback, nfc);
submenu_add_item(
Expand Down