dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612 filepath too short in "hf mf eload / esave / cload / csave" commands. Length was 14, is now 250. Should be enough for awhile.

Browse Source
This commit is contained in:
iceman1001
2014-11-13 22:02:36 +01:00
parent f91f0ebb35
commit 5c065fa089
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/cmdhfmf.c
View File

@@ -1419,7 +1419,7 @@ int CmdHF14AMfESet(const char *Cmd)
int CmdHF14AMfELoad(const char *Cmd) int CmdHF14AMfELoad(const char *Cmd)
{ {
FILE * f; FILE * f;
char filename[20]; char filename[255];
char *fnameptr = filename; char *fnameptr = filename;
char buf[64]; char buf[64];
uint8_t buf8[64]; uint8_t buf8[64];
@@ -1436,7 +1436,7 @@ int CmdHF14AMfELoad(const char *Cmd)
} }
len = strlen(Cmd); len = strlen(Cmd);
if (len > 14) len = 14; if (len > 250) len = 250;
memcpy(filename, Cmd, len); memcpy(filename, Cmd, len);
fnameptr += len; fnameptr += len;
@@ -1494,7 +1494,7 @@ int CmdHF14AMfELoad(const char *Cmd)
int CmdHF14AMfESave(const char *Cmd) int CmdHF14AMfESave(const char *Cmd)
{ {
FILE * f; FILE * f;
char filename[20]; char filename[255];
char * fnameptr = filename; char * fnameptr = filename;
uint8_t buf[64]; uint8_t buf[64];
int i, j, len; int i, j, len;
@@ -1511,7 +1511,7 @@ int CmdHF14AMfESave(const char *Cmd)
} }
len = strlen(Cmd); len = strlen(Cmd);
if (len > 14) len = 14; if (len > 250) len = 250;
if (len < 1) { if (len < 1) {
// get filename // get filename
@@ -1687,7 +1687,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
int CmdHF14AMfCLoad(const char *Cmd) int CmdHF14AMfCLoad(const char *Cmd)
{ {
FILE * f; FILE * f;
char filename[20]; char filename[255];
char * fnameptr = filename; char * fnameptr = filename;
char buf[64]; char buf[64];
uint8_t buf8[64]; uint8_t buf8[64];
@@ -1728,7 +1728,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
return 0; return 0;
} else { } else {
len = strlen(Cmd); len = strlen(Cmd);
if (len > 14) len = 14; if (len > 250) len = 250;
memcpy(filename, Cmd, len); memcpy(filename, Cmd, len);
fnameptr += len; fnameptr += len;
@@ -1851,7 +1851,7 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
int CmdHF14AMfCSave(const char *Cmd) { int CmdHF14AMfCSave(const char *Cmd) {
FILE * f; FILE * f;
char filename[20]; char filename[255];
char * fnameptr = filename; char * fnameptr = filename;
uint8_t fillFromEmulator = 0; uint8_t fillFromEmulator = 0;
uint8_t buf[64]; uint8_t buf[64];
@@ -1893,7 +1893,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
return 0; return 0;
} else { } else {
len = strlen(Cmd); len = strlen(Cmd);
if (len > 14) len = 14; if (len > 250) len = 250;
if (len < 1) { if (len < 1) {
// get filename // get filename

2
client/mifarehost.c
View File

@@ -216,7 +216,7 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}}; UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};
SendCommand(&c); SendCommand(&c);
UsbCommand resp; UsbCommand resp;
if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1; if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;
memcpy(data, resp.d.asBytes, blocksCount * 16); memcpy(data, resp.d.asBytes, blocksCount * 16);
return 0; return 0;