X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e683ecb6a56d5aaea9b3d6428dc8c8acdb64bc9f..f37fe8cb10783de2f75e3088f454090f44da7253:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e5592efa..267f323c 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1040,6 +1040,7 @@ int CmdHF14AMfChk(const char *Cmd)
 						if (!p) {
 							PrintAndLog("Cannot allocate memory for defKeys");
 							free(keyBlock);
+							free(f);
 							return 2;
 						}
 						keyBlock = p;
@@ -1225,10 +1226,10 @@ int CmdHF14AMf1kSim(const char *Cmd)
 						corr_uid |= (uint64_t)data[2] << 48; 
 						corr_uid |= (uint64_t)data[1] << 40; 
 						corr_uid |= (uint64_t)data[0] << 32;
-						corr_uid |= data[7] << 24;
-						corr_uid |= data[6] << 16;
-						corr_uid |= data[5] << 8;
-						corr_uid |= data[4];
+						corr_uid |= (uint64_t)data[7] << 24;
+						corr_uid |= (uint64_t)data[6] << 16;
+						corr_uid |= (uint64_t)data[5] << 8;
+						corr_uid |= (uint64_t)data[4];
 				tryMfk64(corr_uid, data, key);
 					}
 					PrintAndLog("--");