From ca9fe92fb82facc4c17f81926cb665e2b7dd41d2 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 23 Jun 2021 14:50:02 +0300
Subject: [PATCH] fix error show in the `hf search`

---
 client/src/cmdhf.c    | 6 ++++--
 client/src/cmdhf14a.c | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c
index 8a7afeb2a..83b551e33 100644
--- a/client/src/cmdhf.c
+++ b/client/src/cmdhf.c
@@ -91,11 +91,13 @@ int CmdHFSearch(const char *Cmd) {
     PROMPT_CLEARLINE;
     PrintAndLogEx(INPLACE, " Searching for ISO14443-A tag...");
     if (IfPm3Iso14443a()) {
-        if (infoHF14A(false, false, false) > 0) {
+        int sel_state = infoHF14A(false, false, false);
+        if (sel_state > 0) {
             PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO 14443-A tag") " found\n");
             res = PM3_SUCCESS;
 
-            infoHF14A4Applications(verbose);
+            if (sel_state == 1)
+                infoHF14A4Applications(verbose);
         }
     }
 
diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c
index b221869d7..c1e0612f0 100644
--- a/client/src/cmdhf14a.c
+++ b/client/src/cmdhf14a.c
@@ -1807,6 +1807,8 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
 
         memcpy(card.ats, resp.data.asBytes, resp.oldarg[0]);
         card.ats_len = resp.oldarg[0]; // note: ats_len includes CRC Bytes
+        if (card.ats_len > 3)
+            select_status = 1;
     }
 
     if (card.ats_len >= 3) {        // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
@@ -2097,6 +2099,8 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
         if ((card.sak & 0x20) == 0x20) {
             PrintAndLogEx(INFO, "--> SAK incorrectly claims that card supports RATS <--");
         }
+        if (select_status == 1)
+            select_status = 2;
     }
 
     int isMagic = 0;
@@ -2169,7 +2173,7 @@ int infoHF14A4Applications(bool verbose) {
         int res = Iso7816Select(CC_CONTACTLESS, ActivateField, true, (uint8_t *)hintAIDList[i].aid, hintAIDList[i].aid_length, result, sizeof(result), &resultlen, &sw);
         ActivateField = false;
         if (res)
-            continue;
+            break;
 
         if (sw == 0x9000 || sw == 0x6283 || sw == 0x6285) {
             if (!found) {