mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00
Code Issues Activity

Fix Felica standard loading from nfc file (#4311)

Browse Source
This commit is contained in:
RebornedBrain
2025-11-25 16:58:10 +03:00
committed by GitHub
parent 7518dc73c2
commit cd79d4f689
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nfc/protocols/felica/felica.c
View File

@@ -157,6 +157,8 @@ bool felica_load(FelicaData* data, FlipperFormat* ff, uint32_t version) {
case FelicaStandard: case FelicaStandard:
uint32_t systems_total = 0; uint32_t systems_total = 0;
if(!flipper_format_read_uint32(ff, "System found", &systems_total, 1)) break; if(!flipper_format_read_uint32(ff, "System found", &systems_total, 1)) break;
if(systems_total == 0) break;
simple_array_init(data->systems, systems_total); simple_array_init(data->systems, systems_total);
for(uint8_t sys_idx = 0; sys_idx < systems_total; sys_idx++) { for(uint8_t sys_idx = 0; sys_idx < systems_total; sys_idx++) {
@@ -181,6 +183,8 @@ bool felica_load(FelicaData* data, FlipperFormat* ff, uint32_t version) {
do { do {
uint32_t area_count = 0; uint32_t area_count = 0;
if(!flipper_format_read_uint32(ff, "Area found", &area_count, 1)) break; if(!flipper_format_read_uint32(ff, "Area found", &area_count, 1)) break;
if(area_count == 0) break;
simple_array_init(system->areas, area_count); simple_array_init(system->areas, area_count);
furi_string_reset(str_key_buffer); furi_string_reset(str_key_buffer);
@@ -207,6 +211,8 @@ bool felica_load(FelicaData* data, FlipperFormat* ff, uint32_t version) {
do { do {
uint32_t service_count = 0; uint32_t service_count = 0;
if(!flipper_format_read_uint32(ff, "Service found", &service_count, 1)) break; if(!flipper_format_read_uint32(ff, "Service found", &service_count, 1)) break;
if(service_count == 0) break;
simple_array_init(system->services, service_count); simple_array_init(system->services, service_count);
furi_string_reset(str_key_buffer); furi_string_reset(str_key_buffer);
@@ -237,6 +243,8 @@ bool felica_load(FelicaData* data, FlipperFormat* ff, uint32_t version) {
uint32_t public_block_count = 0; uint32_t public_block_count = 0;
if(!flipper_format_read_uint32(ff, "Public blocks read", &public_block_count, 1)) if(!flipper_format_read_uint32(ff, "Public blocks read", &public_block_count, 1))
break; break;
if(public_block_count == 0) break;
simple_array_init(system->public_blocks, public_block_count); simple_array_init(system->public_blocks, public_block_count);
for(uint16_t i = 0; i < public_block_count; i++) { for(uint16_t i = 0; i < public_block_count; i++) {
furi_string_printf(str_key_buffer, "Block %04X", i); furi_string_printf(str_key_buffer, "Block %04X", i);