From 1621b0e7c88d5a1c777bc6a684f5e8633bc3b41d Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 8 May 2020 13:23:06 +0200
Subject: [PATCH] trace list - different alloc

---
 client/src/cmdtrace.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/src/cmdtrace.c b/client/src/cmdtrace.c
index 3e00e10e0..6cbfc2e7a 100644
--- a/client/src/cmdtrace.c
+++ b/client/src/cmdtrace.c
@@ -632,7 +632,9 @@ int CmdTraceList(const char *Cmd) {
         // reserve some space.
         if (g_trace)
             free(g_trace);
+
         g_traceLen = 0;
+
         g_trace = calloc(PM3_CMD_DATA_SIZE, sizeof(uint8_t));
         if (g_trace == NULL) {
             PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
@@ -645,18 +647,22 @@ int CmdTraceList(const char *Cmd) {
         PacketResponseNG response;
         if (!GetFromDevice(BIG_BUF, g_trace, PM3_CMD_DATA_SIZE, 0, NULL, 0, &response, 4000, true)) {
             PrintAndLogEx(WARNING, "timeout while waiting for reply.");
+            free(g_trace);
             return PM3_ETIMEOUT;
         }
 
         g_traceLen = response.oldarg[2];
+
+        // if tracelog buffer was larger and we need to download more.
         if (g_traceLen > PM3_CMD_DATA_SIZE) {
-            uint8_t *p = realloc(g_trace, g_traceLen);
-            if (p == NULL) {
+
+            free(g_trace);
+            g_trace = calloc(g_traceLen, sizeof(uint8_t));
+            if (g_trace == NULL) {
                 PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
-                free(g_trace);
                 return PM3_EMALLOC;
             }
-            g_trace = p;
+
             if (!GetFromDevice(BIG_BUF, g_trace, g_traceLen, 0, NULL, 0, NULL, 2500, false)) {
                 PrintAndLogEx(WARNING, "command execution time out");
                 free(g_trace);