github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 02:27:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved the messages reported when loading json files fails. Usually because we have reserved the wrong size memory

Browse source
This commit is contained in:
iceman1001 2023-07-27 19:38:51 +02:00
commit 39eecc917e
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/src/cmdhfmf.c
View file

@ -4318,13 +4318,17 @@ int CmdHF14AMfELoad(const char *Cmd) {
return PM3_EINVARG;
}
PrintAndLogEx(INFO, "%d blocks ( %u bytes ) to upload", block_cnt, block_cnt * block_width);
PrintAndLogEx(INFO, "Upload " _YELLOW_("%u") " blocks " _YELLOW_("%u") " bytes", block_cnt, block_cnt * block_width);
if (numblks > 0) {
block_cnt = MIN(numblks, block_cnt);
PrintAndLogEx(INFO, "overriding number of blocks, will use %d blocks ( %u bytes )", block_cnt, block_cnt * block_width);
PrintAndLogEx(INFO, "overriding number of blocks, will use " _YELLOW_("%u") " blocks " _YELLOW_("%u") " bytes", block_cnt, block_cnt * block_width);
}
// ICEMAN: bug. if device has been using ICLASS commands,
// the device needs to load the HF fpga image. It takes 1.5 second.
set_fpga_mode(2);
// use RDV4 spiffs
if (use_spiffs && IfPm3Flash() == false) {
PrintAndLogEx(WARNING, "Device not compiled to support spiffs");
@ -4355,10 +4359,6 @@ int CmdHF14AMfELoad(const char *Cmd) {
return PM3_SUCCESS;
}
// ICEMAN: bug. if device has been using ICLASS commands,
// the device needs to load the HF fpga image. It takes 1.5 second.
set_fpga_mode(2);
uint8_t *data = NULL;
size_t bytes_read = 0;
int res = pm3_load_dump(filename, (void **)&data, &bytes_read, (block_width * block_cnt + hdr_len));

19
client/src/fileutils.c
View file

@ -2085,6 +2085,9 @@ int pm3_load_dump(const char *fn, void **pdump, size_t *dumplen, size_t maxdumpl
}
case EML: {
res = loadFileEML_safe(fn, pdump, dumplen);
if (res == PM3_ESOFT) {
PrintAndLogEx(WARNING, "file IO failed");
}
break;
}
case JSON: {
@ -2094,8 +2097,15 @@ int pm3_load_dump(const char *fn, void **pdump, size_t *dumplen, size_t maxdumpl
return PM3_EMALLOC;
}
res = loadFileJSON(fn, *pdump, maxdumplen, dumplen, NULL);
if (res != PM3_SUCCESS) {
free(*pdump);
if (res == PM3_SUCCESS)
return res;
free(*pdump);
if (res == PM3_ESOFT) {
PrintAndLogEx(WARNING, "JSON objects failed to load");
} else if (res == PM3_EMALLOC) {
PrintAndLogEx(WARNING, "Wrong size of allocated memory. Check your parameters");
}
break;
}
@ -2109,11 +2119,6 @@ int pm3_load_dump(const char *fn, void **pdump, size_t *dumplen, size_t maxdumpl
}
}
if (res != PM3_SUCCESS) {
PrintAndLogEx(WARNING, "file not found or locked `" _YELLOW_("%s") "`", fn);
return PM3_EFILE;
}
return res;
}