github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-16 10:03:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix eload from json files failing (ie, hf mf eload -f file.json) when the dump is the full size.

Browse source 
Also fixed an accidental client double free when loading dumps.
This commit is contained in:
nvx 2022-08-05 18:38:51 +10:00
parent 7f5d78d41f
commit d11999a811
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
client/src/fileutils.c
View file

@ -1102,19 +1102,21 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
if (!strcmp(ctype, "mfcard")) { if (!strcmp(ctype, "mfcard")) {
size_t sptr = 0; size_t sptr = 0;
for (int i = 0; i < 256; i++) { for (int i = 0; i < 256; i++) {
char blocks[30] = {0};
snprintf(blocks, sizeof(blocks), "$.blocks.%d", i);
size_t len = 0;
uint8_t block[16];
JsonLoadBufAsHex(root, blocks, block, 16, &len);
if (!len)
break;
if (sptr + 16 > maxdatalen) { if (sptr + 16 > maxdatalen) {
retval = PM3_EMALLOC; retval = PM3_EMALLOC;
goto out; goto out;
} }
char blocks[30] = {0}; memcpy(&udata[sptr], block, 16);
snprintf(blocks, sizeof(blocks), "$.blocks.%d", i);
size_t len = 0;
JsonLoadBufAsHex(root, blocks, &udata[sptr], 16, &len);
if (!len)
break;
sptr += len; sptr += len;
} }
@ -1934,6 +1936,9 @@ int pm3_load_dump(const char *fn, void **pdump, size_t *dumplen, size_t maxdumpl
return PM3_EMALLOC; return PM3_EMALLOC;
} }
res = loadFileJSON(fn, *pdump, maxdumplen, dumplen, NULL); res = loadFileJSON(fn, *pdump, maxdumplen, dumplen, NULL);
if (res != PM3_SUCCESS) {
free(*pdump);
}
break; break;
} }
case DICTIONARY: { case DICTIONARY: {
@ -1944,7 +1949,6 @@ int pm3_load_dump(const char *fn, void **pdump, size_t *dumplen, size_t maxdumpl
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", fn); PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", fn);
free(*pdump);
return PM3_EFILE; return PM3_EFILE;
} }