Merge pull request #2196 from hazardousvoltage/unisniff

cmdtrace.c: fix segfault in 'trace list' after failed load
This commit is contained in:
Iceman
2023-12-06 11:45:16 +01:00
committed by GitHub
+3 -2
View File
@@ -1104,8 +1104,9 @@ static int CmdTraceLoad(const char *Cmd) {
CLIParserFree(ctx);
if (gs_trace) {
free(gs_trace);
free(gs_trace); // maybe better to not clobber this until we have successful load?
gs_trace = NULL;
gs_traceLen = 0;
}
size_t len = 0;
@@ -1292,7 +1293,7 @@ int CmdTraceList(const char *Cmd) {
if (use_buffer == false) {
download_trace();
} else if (gs_traceLen == 0) {
} else if (gs_traceLen == 0 || gs_trace ==NULL) {
PrintAndLogEx(FAILED, "You requested a trace list in offline mode but there is no trace.");
PrintAndLogEx(FAILED, "Consider using " _YELLOW_("`trace load`") " or removing parameter " _YELLOW_("`-1`"));
return PM3_EINVARG;