From: marshmellow42 <marshmellowrf@gmail.com>
Date: Mon, 4 May 2015 03:31:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v2.1.0~12^2~39
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/63e1d35a07b1faa00e5c864024129a9faf8210c1?hp=f9848fd647ce3c708510d8ead6d1b56b26c57ad9

Merge remote-tracking branch 'upstream/master'
---

diff --git a/README.txt b/README.txt
index cb2c7f3c..1a4ddb6d 100644
--- a/README.txt
+++ b/README.txt
@@ -40,7 +40,7 @@ your operating system. Please refer to the Wiki for details.
 
 OBTAINING HARDWARE:
 
-The Proxmark 3 is available for purcahse (assembled and tested) from the
+The Proxmark 3 is available for purchase (assembled and tested) from the
 following locations:
 
    * http://proxmark3.com/
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
 	}