Attachment 572809 Details for Bug 806038 – patch 1/3 for proposed fix

[patch] patch 1/3 for proposed fix

0001-SlotList-updateReaderList-don-t-create-a-fake-E-Gate.patch (text/plain), 1.35 KB, created by Alon Levy on 2012-03-26 17:04:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alon Levy

Created: 2012-03-26 17:04:19 UTC

Size: 1.35 KB

patch

obsolete

>From 446d97c0883eb659125240b64eeced23016626d7 Mon Sep 17 00:00:00 2001
>From: Alon Levy <alevy@redhat.com>
>Date: Thu, 22 Mar 2012 13:24:15 +0200
>Subject: [PATCH 1/4] SlotList::updateReaderList: don't create a fake E-Gate
> reader
>
>---
> src/coolkey/slot.cpp |   19 +------------------
> 1 file changed, 1 insertion(+), 18 deletions(-)
>
>diff --git a/src/coolkey/slot.cpp b/src/coolkey/slot.cpp
>index 0c69826..a5f550b 100644
>--- a/src/coolkey/slot.cpp
>+++ b/src/coolkey/slot.cpp
>@@ -247,27 +247,10 @@ SlotList::updateReaderList()
> 
>     }
> 
>-    if (!readerStates) {
>+    if (readerStates == NULL && readerNames != NULL) {
> 	/* fresh Reader State list, just create it */
> 	readerStates = CKYReader_CreateArray(readerNames, (CKYSize *)&numReaders);
> 
>-	/* if we have no readers, make sure we have at least one to keep things
>-	 * happy */
>-	if (readerStates == NULL &&
>-			 CKYReaderNameList_GetCount(readerNames) == 0) {
>-	    readerStates = (SCARD_READERSTATE *)
>-				malloc(sizeof(SCARD_READERSTATE));
>-	    if (readerStates) {
>-		CKYReader_Init(readerStates);
>-		status = CKYReader_SetReaderName(readerStates, "E-Gate 0 0");
>-		if (status != CKYSUCCESS) {
>- 		    CKYReader_DestroyArray(readerStates, 1);
>-		    readerStates = NULL;
>-		} else {
>-		    numReaders = 1;
>-		}
>-	    }
>-	}
> 	CKYReaderNameList_Destroy(readerNames);
> 	        
> 	if (readerStates == NULL) {
>-- 
>1.7.9.3
>

Actions: View | Diff

Attachments on bug 806038: 572809 | 572810 | 572811 | 572812