handle null pointer exceptions in libnfc

2015-03-13 22:29:58 +01:00
parent f5e319be68
commit c7ca4bad48
1 changed files with 6 additions and 3 deletions
--- 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);
    }