From a317799f010ffa3519e760bfbc190c9bcab5df9c Mon Sep 17 00:00:00 2001
From: Romain Tartiere <romain.tartiere@gmail.com>
Date: Sun, 20 Dec 2009 23:42:58 +0000
Subject: [PATCH] Don't crash when no MIFARE target is present when running the
 regression tests suite.

---
 test/mifare_classic_test.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/test/mifare_classic_test.c b/test/mifare_classic_test.c
index 54766ca..1daad88 100644
--- a/test/mifare_classic_test.c
+++ b/test/mifare_classic_test.c
@@ -1,25 +1,38 @@
 #include "test.h"
 
-static nfc_device_t *device;
-static MifareClassicTag *tags;
+static nfc_device_t *device = NULL;
+static MifareClassicTag *tags = NULL;
 
 int
 mifare_classic_test_setup (MifareClassicTag *tag)
 {
     int res = 0;
 
+    *tag = NULL;
+
     device = nfc_connect (NULL);
     if (!device)
 	res = -1;
 
     if (0 == res) {
 	tags = mifare_classic_get_tags (device);
-	if (!tags || !(tags[0])) {
+	if (!tags) {
 	    nfc_disconnect (device);
+	    device = NULL;
 	    res = -2;
 	}
     }
 
+    if (0 == res) {
+	if (!tags[0]) {
+	    mifare_classic_free_tags (tags);
+	    tags = NULL;
+	    nfc_disconnect (device);
+	    device = NULL;
+	    res = -4;
+	}
+    }
+
     if (0 == res) {
 	*tag = tags[0];
 
@@ -27,6 +40,8 @@ mifare_classic_test_setup (MifareClassicTag *tag)
 	if (res != 0) {
 	    mifare_classic_disconnect (*tag);
 	    nfc_disconnect (device);
+	    *tag = NULL;
+	    device = NULL;
 	    res = -3;
 	}
     }
@@ -39,12 +54,15 @@ mifare_classic_test_teardown (MifareClassicTag tag)
 {
     int res;
 
-    res = mifare_classic_disconnect (tag);
+    if (tag)
+	res = mifare_classic_disconnect (tag);
 
     if (0 == res) {
-	mifare_classic_free_tags (tags);
+	if (tags)
+	    mifare_classic_free_tags (tags);
 
-	nfc_disconnect (device);
+	if (device)
+	    nfc_disconnect (device);
     }
 
     return res;