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

fix mem corruption in trace load/list

Browse Source
This commit is contained in:
Philippe Teuwen
2020-05-08 11:55:43 +02:00
parent 59057b6a35
commit 293b638f71
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/cmdtrace.c
View File

@@ -494,6 +494,7 @@ static int CmdTraceLoad(const char *Cmd) {
if (g_trace) if (g_trace)
free(g_trace); free(g_trace);
g_traceLen = 0;
g_trace = calloc(fsize, sizeof(uint8_t)); g_trace = calloc(fsize, sizeof(uint8_t));
if (!g_trace) { if (!g_trace) {
PrintAndLogEx(FAILED, "Cannot allocate memory for trace"); PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
@@ -628,16 +629,17 @@ int CmdTraceList(const char *Cmd) {
uint16_t tracepos = 0; uint16_t tracepos = 0;
// reserve some space.
if (!g_trace) { if (isOnline) {
// reserve some space.
if (g_trace)
free(g_trace);
g_traceLen = 0;
g_trace = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t)); g_trace = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
if (g_trace == NULL) { if (g_trace == NULL) {
PrintAndLogEx(FAILED, "Cannot allocate memory for trace"); PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
return PM3_EMALLOC; return PM3_EMALLOC;
} }
}
if (isOnline) {
// Query for the size of the trace, downloading PM3_CMD_DATA_SIZE // Query for the size of the trace, downloading PM3_CMD_DATA_SIZE
PacketResponseNG response; PacketResponseNG response;
if (!GetFromDevice(BIG_BUF, g_trace, PM3_CMD_DATA_SIZE, 0, NULL, 0, &response, 4000, true)) { if (!GetFromDevice(BIG_BUF, g_trace, PM3_CMD_DATA_SIZE, 0, NULL, 0, &response, 4000, true)) {