BUGS: Coverty Scan, fixes some memory bugs

diff --git a/client/cmddata.c b/client/cmddata.c
index 556ede06b5687f150187ec4162b41e2c0e107548..a743089463e8b09c35a8b61fcd91e09551b721cd 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1892,7 +1892,8 @@ int getSamples(const char *Cmd, bool silent)
                PrintAndLog("Unpacking...");
                BitstreamOut bout = { got, bits_per_sample * n,  0};
                int j =0;
                PrintAndLog("Unpacking...");
                BitstreamOut bout = { got, bits_per_sample * n,  0};
                int j =0;

-               for (j = 0; j * bits_per_sample < n * 8 && j < sizeof(GraphBuffer); j++) {
+               //for (j = 0; j * bits_per_sample < n * 8 && j < sizeof(GraphBuffer); j++) {
+                       for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {

                        uint8_t sample = getByte(bits_per_sample, &bout);
                        GraphBuffer[j] = ((int) sample )- 128;
                }
                        uint8_t sample = getByte(bits_per_sample, &bout);
                        GraphBuffer[j] = ((int) sample )- 128;
                }

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 0cf5bd7f8bd18e33de63cfa954496580f52254a2..a4986f6bf28ffe591ea568eeaf73882b35df5037 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -547,7 +547,7 @@ int CmdHF14AMfNested(const char *Cmd)
        uint8_t trgKeyType = 0;\r
        uint8_t SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t trgKeyType = 0;\r
        uint8_t SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

-       uint8_t keyBlock[13*6];\r
+       uint8_t keyBlock[14*6];\r

        uint64_t key64 = 0;\r
        bool transferToEml = false;\r
        \r
        uint64_t key64 = 0;\r
        bool transferToEml = false;\r
        \r


@@ -1311,7 +1311,7 @@ int CmdHF14AMfESave(const char *Cmd)
                for (j = 0; j < 7; j++, fnameptr += 2)\r
                        sprintf(fnameptr, "%02X", buf[j]); \r
        } else {\r
                for (j = 0; j < 7; j++, fnameptr += 2)\r
                        sprintf(fnameptr, "%02X", buf[j]); \r
        } else {\r

-               fnameptr += len;\r
+               fnameptr += len-4;\r

        }\r
 \r
        // add file extension\r
        }\r
 \r
        // add file extension\r


@@ -1575,7 +1575,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
 \r
                memcpy(filename, Cmd, len);\r
                if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
 \r
                memcpy(filename, Cmd, len);\r

-               fnameptr += len;\r
+               fnameptr += len-4;\r

 \r
                sprintf(fnameptr, ".eml"); \r
        \r
 \r
                sprintf(fnameptr, ".eml"); \r
        \r

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index da8a0d2783eb429d68500e76bc8b5421a0700d49..e02c445dbbf1fc48a5905f93e5dd7a560837e6ef 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1113,7 +1113,7 @@ int CmdHF14AMfUDump(const char *Cmd){
                sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",
                        data[0], data[1], data[2], data[4], data[5], data[6], data[7]);
        } else {
                sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",
                        data[0], data[1], data[2], data[4], data[5], data[6], data[7]);
        } else {

-               sprintf(fnameptr + fileNlen," .bin");
+               sprintf(fnameptr + fileNlen,".bin");

        }
 
        if ((fout = fopen(filename,"wb")) == NULL) { 
        }
 
        if ((fout = fopen(filename,"wb")) == NULL) {