From 93bed892a82f3980c1bb77db29806820c52ca64b Mon Sep 17 00:00:00 2001
From: Torin Carey <torin@tcarey.uk>
Date: Mon, 18 May 2020 01:36:22 +0100
Subject: [PATCH] tests: Fix card present check

Check SC_READER_CARD_PRESENT flag rather than == 1.
Having no card present on the first loop and then inserting a card will
return rc = CARD_PRESENT | CARD_CHANGED (= 3). SEGFAULT ensures when we mistake
the unset opt_reader as having a present card.
---
 src/tests/sc-test.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/tests/sc-test.c b/src/tests/sc-test.c
index 35b42965..2d9d3dda 100644
--- a/src/tests/sc-test.c
+++ b/src/tests/sc-test.c
@@ -83,18 +83,22 @@ int sc_test_init(int *argc, char *argv[])
 			if (rc < 0)
 				return rc;
 		} else {
-			for (i = rc = 0; rc != 1 && i < (int) sc_ctx_get_reader_count(ctx); i++)
+			for (i = rc = 0; !(rc & SC_READER_CARD_PRESENT) &&
+								i < (int) sc_ctx_get_reader_count(ctx); i++)
 				rc = sc_detect_card_presence(sc_ctx_get_reader(ctx, i));
-			if (rc == 1)
+			if (rc < 0)
+				return rc;
+			if (rc & SC_READER_CARD_PRESENT) {
 				opt_reader = i - 1;
+			} else {
+				rc = 0;
+			}
 		}
 
 		if (rc > 0) {
 			printf("Card detected in reader '%s'\n",sc_ctx_get_reader(ctx, opt_reader)->name);
 			break;
 		}
-		if (rc < 0)
-			return rc;
 
 		printf("Please insert a smart card. Press return to continue");
 		fflush(stdout);