DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-11-23 10:01:58 +03:00
Code Issues Projects Releases Wiki Activity

Use single call to free FuriString

Browse Source
This commit is contained in:
noproto 2024-10-09 16:03:29 -04:00
parent b843856976
commit 3976f128dc
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
applications/main/nfc/scenes/nfc_scene_mf_classic_dict_attack.c
View File

@ -141,17 +141,16 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(NfcApp* instance) {
uint32_t state = uint32_t state =
scene_manager_get_scene_state(instance->scene_manager, NfcSceneMfClassicDictAttack); scene_manager_get_scene_state(instance->scene_manager, NfcSceneMfClassicDictAttack);
if(state == DictAttackStateCUIDDictInProgress) { if(state == DictAttackStateCUIDDictInProgress) {
do { size_t cuid_len = 0;
size_t cuid_len = 0; const uint8_t* cuid = nfc_device_get_uid(instance->nfc_device, &cuid_len);
const uint8_t* cuid = nfc_device_get_uid(instance->nfc_device, &cuid_len); FuriString* cuid_dict_path = furi_string_alloc_printf(
FuriString* cuid_dict_path = furi_string_alloc_printf( "%s/mf_classic_dict_%08lx.nfc",
"%s/mf_classic_dict_%08lx.nfc", EXT_PATH("nfc/assets"),
EXT_PATH("nfc/assets"), (uint32_t)bit_lib_bytes_to_num_be(cuid + (cuid_len - 4), 4));
(uint32_t)bit_lib_bytes_to_num_be(cuid + (cuid_len - 4), 4));
do {
if(!keys_dict_check_presence(furi_string_get_cstr(cuid_dict_path))) { if(!keys_dict_check_presence(furi_string_get_cstr(cuid_dict_path))) {
state = DictAttackStateUserDictInProgress; state = DictAttackStateUserDictInProgress;
furi_string_free(cuid_dict_path);
break; break;
} }
@ -160,8 +159,6 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(NfcApp* instance) {
KeysDictModeOpenExisting, KeysDictModeOpenExisting,
sizeof(MfClassicKey)); sizeof(MfClassicKey));
furi_string_free(cuid_dict_path);
if(keys_dict_get_total_keys(instance->nfc_dict_context.dict) == 0) { if(keys_dict_get_total_keys(instance->nfc_dict_context.dict) == 0) {
keys_dict_free(instance->nfc_dict_context.dict); keys_dict_free(instance->nfc_dict_context.dict);
state = DictAttackStateUserDictInProgress; state = DictAttackStateUserDictInProgress;
@ -170,6 +167,8 @@ static void nfc_scene_mf_classic_dict_attack_prepare_view(NfcApp* instance) {
dict_attack_set_header(instance->dict_attack, "MF Classic CUID Dictionary"); dict_attack_set_header(instance->dict_attack, "MF Classic CUID Dictionary");
} while(false); } while(false);
furi_string_free(cuid_dict_path);
} }
if(state == DictAttackStateUserDictInProgress) { if(state == DictAttackStateUserDictInProgress) {
do { do {