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

apply fix for v3

Browse source
This commit is contained in:
iceman1001 2023-10-31 00:03:53 +01:00
commit 9835543a2f
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/src/fileutils.c
View file

@ -1157,7 +1157,8 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
uint8_t block[MFBLOCK_SIZE] = {0}; // ensure zero-filled when partial block of data read uint8_t block[MFBLOCK_SIZE] = {0}; // ensure zero-filled when partial block of data read
JsonLoadBufAsHex(root, blocks, block, MFBLOCK_SIZE, &len); JsonLoadBufAsHex(root, blocks, block, MFBLOCK_SIZE, &len);
if (!len) { if (!len) {
PrintAndLogEx(WARNING, "WARNING: json %s block %d has zero-length data ... file parsing stopped", ctype, i); PrintAndLogEx(WARNING, "WARNING: json %s block %d has zero-length data", ctype, i);
PrintAndLogEx(INFO, "file parsing stopped");
break; break;
} else if (len != MFBLOCK_SIZE) { } else if (len != MFBLOCK_SIZE) {
PrintAndLogEx(WARNING, "WARNING: json %s block %d only has %d bytes, expected %d (will fill with zero data)", ctype, i, len, MFBLOCK_SIZE); PrintAndLogEx(WARNING, "WARNING: json %s block %d only has %d bytes, expected %d (will fill with zero data)", ctype, i, len, MFBLOCK_SIZE);
@ -1182,21 +1183,27 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
*datalen = MFU_DUMP_PREFIX_LENGTH; *datalen = MFU_DUMP_PREFIX_LENGTH;
size_t sptr = 0; size_t sptr = 0;
for (int i = 0; i < maxdatalen; i++) { // load blocks (i) from 0..N, but check sptr against total data length, not `i`
for (int i = 0; sptr < maxdatalen; i++) {
if (sptr + MFBLOCK_SIZE > maxdatalen) { if (sptr + MFBLOCK_SIZE > maxdatalen) {
PrintAndLogEx(ERR, "loadFileJSONex: maxdatalen=%4d (%04x) block (i)=%4d (%04x) sptr=%4d (%04x) -- exceeded maxdatalen", maxdatalen, maxdatalen, i, i, sptr, sptr);
retval = PM3_EMALLOC; retval = PM3_EMALLOC;
goto out; goto out;
} }
snprintf(blocks, sizeof(blocks), "$.blocks.%d", i); snprintf(blocks, sizeof(blocks), "$.blocks.%d", i);
uint8_t block[MFBLOCK_SIZE]; uint8_t block[MFBLOCK_SIZE] = {0}; // ensure zero-filled when partial block of data read
JsonLoadBufAsHex(root, blocks, block, MFBLOCK_SIZE, &len); JsonLoadBufAsHex(root, blocks, block, MFBLOCK_SIZE, &len);
if (!len) if (!len) {
PrintAndLogEx(WARNING, "WARNING: json %s block %d has zero-length data", ctype, i);
PrintAndLogEx(INFO, "file parsing stopped");
break; break;
} else if (len != MFBLOCK_SIZE) {
PrintAndLogEx(WARNING, "WARNING: json %s block %d only has %d bytes, expected %d (will fill with zero data)", ctype, i, len, MFBLOCK_SIZE);
}
memcpy(&udata.bytes[sptr], block, MFBLOCK_SIZE); memcpy(&udata.bytes[sptr], block, MFBLOCK_SIZE);
sptr += len; sptr += MFBLOCK_SIZE; // always increment pointer by the full block size, even if only partial data read from dump file
} }
*datalen = sptr; *datalen = sptr;