From 12885d6726be8c089da378147a86b3e54ddc1e49 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 3 Jan 2020 18:41:53 +0100
Subject: [PATCH] covery 263986

---
 client/cmdhffelica.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 32a6fe164..734962651 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -1332,6 +1332,7 @@ static int CmdHFFelicaRequestService(const char *Cmd) {
         }
         i++;
     }
+
     if (!all_nodes) {
         // Node Number
         if (param_getlength(Cmd, paramCount) == 2) {
@@ -1366,11 +1367,12 @@ static int CmdHFFelicaRequestService(const char *Cmd) {
     if (datalen > 0) {
         flags |= FELICA_RAW;
     }
-    
+
     datalen = (datalen > PM3_CMD_DATA_SIZE) ? PM3_CMD_DATA_SIZE : datalen;
     if (!custom_IDm && !check_last_idm(data, datalen)) {
         return PM3_EINVARG;
     }
+    
     data[0] = int_to_hex(&datalen);
     data[1] = 0x02; // Service Request Command ID
     if (all_nodes) {
@@ -1742,7 +1744,7 @@ static int CmdHFFelicaCmdRaw(const char *Cmd) {
                 sscanf(buf, "%x", &temp);
                 data[datalen] = (uint8_t)(temp & 0xff);
                 *buf = 0;
-                if (++datalen >= sizeof(data)) {
+                if (++datalen >= (sizeof(data) - 2)) {
                     if (crc)
                         PrintAndLogEx(WARNING, "Buffer is full, we can't add CRC to your data");
                     break;