From c6a14e1a6779ded87b848b06b2cbc51a147f96b3 Mon Sep 17 00:00:00 2001
From: pborsutzki <pborsutzki@users.noreply.github.com>
Date: Sat, 2 Dec 2023 08:27:58 +0100
Subject: [PATCH] Fixed a zero allocation error when reading an iso15693 nfc
 tag with no additional blocks. (#3229)

Co-authored-by: gornekich <n.gorbadey@gmail.com>
---
 .../iso15693_3/iso15693_3_poller_i.c          | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c b/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
index 917f7dbb8e0..ca6f5435e3e 100644
--- a/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
+++ b/lib/nfc/protocols/iso15693_3/iso15693_3_poller_i.c
@@ -108,28 +108,30 @@ Iso15693_3Error iso15693_3_poller_activate(Iso15693_3Poller* instance, Iso15693_
             break;
         }
 
-        // Read blocks: Optional command
-        simple_array_init(data->block_data, system_info->block_count * system_info->block_size);
-        ret = iso15693_3_poller_read_blocks(
-            instance,
-            simple_array_get_data(data->block_data),
-            system_info->block_count,
-            system_info->block_size);
-        if(ret != Iso15693_3ErrorNone) {
-            ret = iso15693_3_poller_filter_error(ret);
-            break;
-        }
-
-        // Get block security status: Optional command
-        simple_array_init(data->block_security, system_info->block_count);
-
-        ret = iso15693_3_poller_get_blocks_security(
-            instance, simple_array_get_data(data->block_security), system_info->block_count);
-        if(ret != Iso15693_3ErrorNone) {
-            ret = iso15693_3_poller_filter_error(ret);
-            break;
+        if(system_info->block_count > 0) {
+            // Read blocks: Optional command
+            simple_array_init(
+                data->block_data, system_info->block_count * system_info->block_size);
+            ret = iso15693_3_poller_read_blocks(
+                instance,
+                simple_array_get_data(data->block_data),
+                system_info->block_count,
+                system_info->block_size);
+            if(ret != Iso15693_3ErrorNone) {
+                ret = iso15693_3_poller_filter_error(ret);
+                break;
+            }
+
+            // Get block security status: Optional command
+            simple_array_init(data->block_security, system_info->block_count);
+
+            ret = iso15693_3_poller_get_blocks_security(
+                instance, simple_array_get_data(data->block_security), system_info->block_count);
+            if(ret != Iso15693_3ErrorNone) {
+                ret = iso15693_3_poller_filter_error(ret);
+                break;
+            }
         }
-
     } while(false);
 
     return ret;