From acd6445d3bbb7a6fe1816f542118b53f6a6b8a9c Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Sat, 27 Jan 2024 03:20:53 +0300 Subject: [PATCH] fix NFC V dumps v3 crashing at info page --- lib/nfc/protocols/iso15693_3/iso15693_3.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/nfc/protocols/iso15693_3/iso15693_3.c b/lib/nfc/protocols/iso15693_3/iso15693_3.c index 3203cbad0..472edfa95 100644 --- a/lib/nfc/protocols/iso15693_3/iso15693_3.c +++ b/lib/nfc/protocols/iso15693_3/iso15693_3.c @@ -328,7 +328,12 @@ bool iso15693_3_is_block_locked(const Iso15693_3Data* data, uint8_t block_index) furi_assert(data); furi_assert(block_index < data->system_info.block_count); - return *(const uint8_t*)simple_array_cget(data->block_security, block_index); + // TODO: make proper fix for this, old format had no Block Security Status in file + if(simple_array_get_count(data->block_security) != 0) { + return *(const uint8_t*)simple_array_cget(data->block_security, block_index); + } else { + return false; + } } uint8_t iso15693_3_get_manufacturer_id(const Iso15693_3Data* data) {