From 66fd599c7075180ca0466695249953254a8548ce Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 4 Jun 2020 11:32:33 +0200
Subject: [PATCH] fix: 'hf mfu ndef' - now prints ID field correct if present

---
 client/src/mifare/ndef.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/mifare/ndef.c b/client/src/mifare/ndef.c
index 45ad2e081..58b9b0a25 100644
--- a/client/src/mifare/ndef.c
+++ b/client/src/mifare/ndef.c
@@ -127,6 +127,7 @@ static int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header)
 
     if (header->IDLenPresent) {
         header->IDLen = (header->ShortRecordBit ? (data[3]) : (data[6]));
+        header->ID = data + header->len + header->TypeLen;
     } else {
         header->IDLen = 0;
     }
@@ -136,7 +137,7 @@ static int ndefDecodeHeader(uint8_t *data, size_t datalen, NDEFHeader_t *header)
     header->RecLen = header->len + header->TypeLen + header->PayloadLen + header->IDLen;
 
     if (header->RecLen > datalen)
-        return 3;
+        return PM3_ESOFT;
 
     return PM3_SUCCESS;
 }