github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #62 from merlokk/err

Browse source 
fix memory error
This commit is contained in:
Iceman 2018-11-29 21:34:00 +01:00 • committed by GitHub
commit 24fc3fdb58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/loclass/fileutils.c
View file

@ -36,7 +36,9 @@
****************************************************************************/ ****************************************************************************/
#include "fileutils.h" #include "fileutils.h"
#ifndef ON_DEVICE #ifndef ON_DEVICE
#define PATH_MAX_LENGTH 100
/** /**
* @brief checks if a file exists * @brief checks if a file exists
@ -160,7 +162,7 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
case jsfCardMemory: case jsfCardMemory:
JsonSaveStr(root, "FileType", "mfcard"); JsonSaveStr(root, "FileType", "mfcard");
for (int i = 0; i < (datalen / 16); i++) { for (int i = 0; i < (datalen / 16); i++) {
char path[30] = {0}; char path[PATH_MAX_LENGTH] = {0};
sprintf(path, "$.blocks.%d", i); sprintf(path, "$.blocks.%d", i);
JsonSaveBufAsHexCompact(root, path, &data[i * 16], 16); JsonSaveBufAsHexCompact(root, path, &data[i * 16], 16);
@ -171,18 +173,18 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
} }
if (mfIsSectorTrailer(i)) { if (mfIsSectorTrailer(i)) {
char patha[30] = {0}; memset(path, 0x00, sizeof(path));
sprintf(patha, "$.SectorKeys.%d.KeyA", mfSectorNum(i)); sprintf(path, "$.SectorKeys.%d.KeyA", mfSectorNum(i));
JsonSaveBufAsHexCompact(root, patha, &data[i * 16], 6); JsonSaveBufAsHexCompact(root, path, &data[i * 16], 6);
char pathb[30] = {0}; memset(path, 0x00, sizeof(path));
sprintf(pathb, "$.SectorKeys.%d.KeyB", mfSectorNum(i)); sprintf(path, "$.SectorKeys.%d.KeyB", mfSectorNum(i));
JsonSaveBufAsHexCompact(root, pathb, &data[i * 16 + 10], 6); JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 10], 6);
char pathc[30] = {0}; memset(path, 0x00, sizeof(path));
uint8_t *adata = &data[i * 16 + 6]; uint8_t *adata = &data[i * 16 + 6];
sprintf(pathc, "$.SectorKeys.%d.AccessConditions", mfSectorNum(i)); sprintf(path, "$.SectorKeys.%d.AccessConditions", mfSectorNum(i));
JsonSaveBufAsHexCompact(root, pathc, &data[i * 16 + 6], 4); JsonSaveBufAsHexCompact(root, path, &data[i * 16 + 6], 4);
memset(path, 0x00, sizeof(path)); memset(path, 0x00, sizeof(path));
sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 3); sprintf(path, "$.SectorKeys.%d.AccessConditionsText.block%d", mfSectorNum(i), i - 3);