From d2168412e175946480b2bc64d553247e40d23948 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Sat, 28 Jun 2003 08:08:16 +0000
Subject: [PATCH]  - (djm) Bug #593: Sanity check OpenSC card reader number;
 patch from    aj@dungeon.inka.de

---
 ChangeLog      | 2 ++
 scard-opensc.c | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f4a76982..ba3a0140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20030628
  - (djm) Bug #591: use PKCS#15 private key label as a comment in case 
    of OpenSC. Report and patch from larsch@trustcenter.de
+ - (djm) Bug #593: Sanity check OpenSC card reader number; patch from 
+   aj@dungeon.inka.de
 
 20030628
  - (dtucker) OpenBSD CVS Sync
diff --git a/scard-opensc.c b/scard-opensc.c
index e8e12dd8..4ab87ea8 100644
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -89,6 +89,12 @@ sc_init(void)
 	r = sc_establish_context(&ctx, "openssh");
 	if (r)
 		goto err;
+	if (sc_reader_id >= ctx->reader_count) {
+		r = SC_ERROR_NO_READERS_FOUND;
+		error("Illegal reader number %d (max %d)", sc_reader_id, 
+		    ctx->reader_count -1);
+		goto err;
+	}
 	r = sc_connect_card(ctx->reader[sc_reader_id], 0, &card);
 	if (r)
 		goto err;
-- 
2.45.2