mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-3481] Properly reset the NFC device data (#2980)

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Astra 2023-08-23 03:40:05 +09:00 committed by GitHub
parent ace0901125
commit 27b2808ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/nfc/scenes/nfc_scene_file_select.c
View File

@ -3,6 +3,8 @@
void nfc_scene_file_select_on_enter(void* context) { void nfc_scene_file_select_on_enter(void* context) {
Nfc* nfc = context; Nfc* nfc = context;
nfc_device_data_clear(&nfc->dev->dev_data);
// Process file_select return // Process file_select return
nfc_device_set_loading_callback(nfc->dev, nfc_show_loading_popup, nfc); nfc_device_set_loading_callback(nfc->dev, nfc_show_loading_popup, nfc);
if(!furi_string_size(nfc->dev->load_path)) { if(!furi_string_size(nfc->dev->load_path)) {

3
lib/nfc/nfc_device.c
View File

@ -1625,6 +1625,9 @@ void nfc_device_data_clear(NfcDeviceData* dev_data) {
} else if(dev_data->protocol == NfcDeviceProtocolEMV) { } else if(dev_data->protocol == NfcDeviceProtocolEMV) {
memset(&dev_data->emv_data, 0, sizeof(EmvData)); memset(&dev_data->emv_data, 0, sizeof(EmvData));
} }
furi_string_reset(dev_data->parsed_data);
memset(&dev_data->nfc_data, 0, sizeof(FuriHalNfcDevData)); memset(&dev_data->nfc_data, 0, sizeof(FuriHalNfcDevData));
dev_data->protocol = NfcDeviceProtocolUnknown; dev_data->protocol = NfcDeviceProtocolUnknown;
furi_string_reset(dev_data->parsed_data); furi_string_reset(dev_data->parsed_data);