From c7ca4bad4873e14782dd47db38fae82be3839ed6 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Fri, 13 Mar 2015 22:29:58 +0100
Subject: [PATCH] handle null pointer exceptions in libnfc

---
 pcsc-relay/src/lnfc.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pcsc-relay/src/lnfc.c b/pcsc-relay/src/lnfc.c
index 35f716b..4d88982 100644
--- a/pcsc-relay/src/lnfc.c
+++ b/pcsc-relay/src/lnfc.c
@@ -171,9 +171,12 @@ static int lnfc_disconnect(driver_data_t *driver_data)
 
 
     if (data) {
-        nfc_abort_command(data->pndTarget);
-        nfc_close(data->pndTarget);
-        nfc_exit(data->context);
+        if (data->pndTarget) {
+            nfc_abort_command(data->pndTarget);
+            nfc_close(data->pndTarget);
+        }
+        if (data->context)
+            nfc_exit(data->context);
         free(data);
     }