From: Martin Holst Swende <martin@swende.se>
Date: Sun, 3 May 2015 20:09:52 +0000 (+0200)
Subject: Fixes to issue #100
X-Git-Tag: v2.1.0~13
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/4b36037948fb7f0de45ac1033e6da335810c4993

Fixes to issue #100
---

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 200c9dcd..d4285eea 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -177,8 +177,8 @@ int CmdHF14AReader(const char *Cmd)
 			SendCommand(&c);
 			WaitForResponse(CMD_ACK,&resp);
 
-			uint8_t version[8] = {0,0,0,0,0,0,0,0};
-			memcpy(&version, resp.d.asBytes, resp.arg[0]);
+			uint8_t version[10] = {0};
+			memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version));
 			uint8_t len = resp.arg[0] & 0xff;
 			switch ( len ){
 				// todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command.
@@ -221,7 +221,7 @@ int CmdHF14AReader(const char *Cmd)
 		SendCommand(&c);
 		WaitForResponse(CMD_ACK,&resp);
 		
-	    memcpy(&card.ats, resp.d.asBytes, resp.arg[0]);
+	    memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
 		card.ats_len = resp.arg[0];				// note: ats_len includes CRC Bytes
 	}