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

Make sure g_trace is null when not allocated

Browse source
This commit is contained in:
Philippe Teuwen 2021-08-21 14:34:20 +02:00
commit 6197482b77
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/src/cmdtrace.c
View file

@ -540,6 +540,7 @@ static int download_trace(void) {
if (!GetFromDevice(BIG_BUF, g_trace, g_traceLen, 0, NULL, 0, NULL, 2500, false)) { if (!GetFromDevice(BIG_BUF, g_trace, g_traceLen, 0, NULL, 0, NULL, 2500, false)) {
PrintAndLogEx(WARNING, "command execution time out"); PrintAndLogEx(WARNING, "command execution time out");
free(g_trace); free(g_trace);
g_trace = NULL;
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
} }
@ -578,8 +579,10 @@ static int CmdTraceLoad(const char *Cmd) {
CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen); CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen);
CLIParserFree(ctx); CLIParserFree(ctx);
if (g_trace) if (g_trace) {
free(g_trace); free(g_trace);
g_trace = NULL;
}
size_t len = 0; size_t len = 0;
if (loadFile_safe(filename, ".trace", (void **)&g_trace, &len) != PM3_SUCCESS) { if (loadFile_safe(filename, ".trace", (void **)&g_trace, &len) != PM3_SUCCESS) {