From 1fda90aab43259eb0c7c5bde4679dfc5df2cfb54 Mon Sep 17 00:00:00 2001
From: frankmorgner <frankmorgner@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Wed, 10 Nov 2010 14:30:38 +0000
Subject: [PATCH] added more error handling

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@351 96b47cad-a561-4643-ad3b-153ac7d7599c
---
 pcsc-relay/src/lnfc.c       |  1 -
 pcsc-relay/src/opicc.c      | 25 ++++++++++++++++++-------
 pcsc-relay/src/pcsc-relay.c | 13 +++++++++----
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/pcsc-relay/src/lnfc.c b/pcsc-relay/src/lnfc.c
index 0f27d60..99017be 100644
--- a/pcsc-relay/src/lnfc.c
+++ b/pcsc-relay/src/lnfc.c
@@ -114,7 +114,6 @@ static int lnfc_connect(void **driver_data)
     data = realloc(*driver_data, sizeof *data);
     if (!data)
         return 0;
-    memset(data, 0, sizeof *data);
     *driver_data = data;
 
     /* FIXME
diff --git a/pcsc-relay/src/opicc.c b/pcsc-relay/src/opicc.c
index 4bd75f7..e219ed4 100644
--- a/pcsc-relay/src/opicc.c
+++ b/pcsc-relay/src/opicc.c
@@ -70,7 +70,6 @@ err:
 size_t picc_decode_apdu(const char *inbuf, size_t inlen, unsigned char **outbuf)
 {
     size_t pos, length;
-    unsigned char buf[0xffff];
     char *end, *p;
     unsigned long int b;
 
@@ -120,10 +119,10 @@ static int picc_connect(void **driver_data)
     if (!driver_data)
         return 0;
 
+
     data = realloc(*driver_data, sizeof *data);
     if (!data)
         return 0;
-    memset(data, 0, sizeof *data);
     *driver_data = data;
 
     data->fd = fopen(PICCDEV, "a+"); /*O_NOCTTY ?*/
@@ -132,6 +131,11 @@ static int picc_connect(void **driver_data)
             fprintf(stderr,"Error opening %s\n", PICCDEV);
         return 0;
     }
+
+    data->buf = NULL;
+    data->buflen = 0;
+
+
     if (debug || verbose)
         printf("Connected to %s\n", PICCDEV);
 
@@ -141,13 +145,18 @@ static int picc_connect(void **driver_data)
 static int picc_disconnect(void *driver_data)
 {
     struct picc_data *data = driver_data;
+
+
     if (data) {
         if (data->fd)
             fclose(data->fd); 
-        if (data->buf)
-            free(data->buf);
+        data->fd = NULL;
+        free(data->buf);
+        data->buf = NULL;
+        data->buflen = 0;
     }
 
+
     return 1;
 }
 
@@ -156,13 +165,15 @@ static int picc_receive_capdu(void *driver_data,
 {
     ssize_t linelen;
     struct picc_data *data = driver_data;
+    size_t buflen = 0;
+    char *buf = NULL;
 
     if (!data || !capdu || !len)
         return 0;
 
 
     /* read C-APDU */
-    linelen = getline(&data->buf, &data->buflen, data->fd);
+    linelen = getline(&buf, &buflen, data->fd);
     if (linelen < 0) {
         if (linelen < 0) {
             if (debug || verbose)
@@ -177,11 +188,11 @@ static int picc_receive_capdu(void *driver_data,
     fflush(data->fd);
 
     if (debug)
-        printf("%s\n", data->buf);
+        printf("%s\n", buf);
 
 
     /* decode C-APDU */
-    *len = picc_decode_apdu(data->buf, linelen, capdu);
+    *len = picc_decode_apdu(buf, linelen, capdu);
 
     return 1;
 }
diff --git a/pcsc-relay/src/pcsc-relay.c b/pcsc-relay/src/pcsc-relay.c
index d5560fe..a01c71c 100644
--- a/pcsc-relay/src/pcsc-relay.c
+++ b/pcsc-relay/src/pcsc-relay.c
@@ -33,7 +33,7 @@
 #include "pcsc-relay.h"
 #include "pcscutil.h"
 
-struct rf_driver *driver = &driver_openpicc;
+struct rf_driver *driver = &driver_libnfc;
 
 
 static LPSTR readers = NULL;
@@ -141,7 +141,8 @@ parse_err:
 
 
     /* Open the device */
-    driver->connect(&driver->data);
+    if (!driver->connect(&driver->data))
+        goto err;
 
     /* connect to reader and card */
     r = pcsc_connect(readernum, SCARD_SHARE_EXCLUSIVE, SCARD_PROTOCOL_ANY,
@@ -151,7 +152,10 @@ parse_err:
 
 
     while(1) {
-        driver->receive_capdu(driver->data, (unsigned char **) &buf, &buflen);
+        if (!driver->receive_capdu(driver->data, (unsigned char **) &buf, &buflen))
+            goto err;
+        if (!buflen)
+            continue;
 
         if (!verbose)
             printb("C-APDU: ===================================================\n", buf, buflen);
@@ -167,7 +171,8 @@ parse_err:
             printb("R-APDU:\n", outputBuffer, outputLength);
 
 
-        driver->send_rapdu(driver->data, outputBuffer, outputLength);
+        if (!driver->send_rapdu(driver->data, outputBuffer, outputLength))
+            goto err;
     }
 
 err: