Merge remote-tracking branch 'upstream/master'

diff --git a/README.txt b/README.txt
index cb2c7f3c783a137b43f99c7d14010d611bfa49ee..1a4ddb6d0e693b3192f7270a5b8326d75b4fd86a 100644 (file)
--- 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 200c9dcd6d9dd84431fb71ea79f9096f0d32b24b..d4285eeab5df128444ef2cc0ab59761cfb041507 100644 (file)
--- 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
        }