@iceman1001 s coverity scan fixes

diff --git a/client/cmddata.c b/client/cmddata.c
index 3ea756135cc3dc4316d512e7df49afafda6d2437..b9069bc19cb82b150b05de62345a188a56e5f6aa 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1892,7 +1892,7 @@ 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 < 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 b96c9c1a78f8e180a9b831574e377998d005787f..aa3b66dc64b960f2bf855b62257f904b26196a4e 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


@@ -1202,7 +1202,7 @@ int CmdHF14AMfELoad(const char *Cmd)
        \r
        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
 \r
        \r
        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
 \r

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

 \r
        sprintf(fnameptr, ".eml"); \r
        \r
 \r
        sprintf(fnameptr, ".eml"); \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


@@ -1592,6 +1592,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                        memset(buf, 0, sizeof(buf));\r
                        \r
                        if (fgets(buf, sizeof(buf), f) == NULL) {\r
                        memset(buf, 0, sizeof(buf));\r
                        \r
                        if (fgets(buf, sizeof(buf), f) == NULL) {\r

+                               fclose(f);\r

                                PrintAndLog("File reading error.");\r
                                return 2;\r
                        }\r
                                PrintAndLog("File reading error.");\r
                                return 2;\r
                        }\r


@@ -1600,6 +1601,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                                if(strlen(buf) && feof(f))\r
                                        break;\r
                                PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
                                if(strlen(buf) && feof(f))\r
                                        break;\r
                                PrintAndLog("File content error. Block data must include 32 HEX symbols");\r

+                               fclose(f);\r

                                return 2;\r
                        }\r
                        for (i = 0; i < 32; i += 2)\r
                                return 2;\r
                        }\r
                        for (i = 0; i < 32; i += 2)\r

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index e7b90b4c82641097d0736dd9b58770c1684bf4fc..112828574dfc51a3a4da2c3ca413a144b6aba15c 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -1103,7 +1103,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) { 

diff --git a/client/cmdscript.c b/client/cmdscript.c
index 928a216d7334bc72cf52f4b457f12ecbb111683c..730f4e96ab26dd78e3392015af2ad5ef6d82a8af 100644 (file)
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -83,7 +83,7 @@ int CmdList(const char *Cmd)
     {
         while ((ep = readdir (dp)) != NULL)
         {
     {
         while ((ep = readdir (dp)) != NULL)
         {

-            if(ep->d_name != NULL && str_ends_with(ep->d_name, ".lua"))
+            if(str_ends_with(ep->d_name, ".lua"))

                 PrintAndLog("%-16s %s", ep->d_name, "A script file");
         }
         (void) closedir (dp);
                 PrintAndLog("%-16s %s", ep->d_name, "A script file");
         }
         (void) closedir (dp);

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 35499b83677e18129e2278221ed865edbc52f32a..237979c1bfaaefc13ca0940093c2a47d5b954f40 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -354,10 +354,7 @@ int loadTraceCard(uint8_t *tuid) {
        FillFileNameByUID(traceFileName, tuid, ".eml", 7);\r
 \r
        f = fopen(traceFileName, "r");\r
        FillFileNameByUID(traceFileName, tuid, ".eml", 7);\r
 \r
        f = fopen(traceFileName, "r");\r

-       if (!f) {\r
-               fclose(f);\r
-               return 1;\r
-       }\r
+       if (!f) return 1;\r

        \r
        blockNum = 0;\r
                \r
        \r
        blockNum = 0;\r
                \r


@@ -394,10 +391,7 @@ int saveTraceCard(void) {
        if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;\r
        \r
        f = fopen(traceFileName, "w+");\r
        if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;\r
        \r
        f = fopen(traceFileName, "w+");\r

-       if ( !f ) {\r
-               fclose(f);\r
-               return 1;\r
-       }\r
+       if ( !f ) return 1;\r

        \r
        for (int i = 0; i < 64; i++) {  // blocks\r
                for (int j = 0; j < 16; j++)  // bytes\r
        \r
        for (int i = 0; i < 64; i++) {  // blocks\r
                for (int j = 0; j < 16; j++)  // bytes\r

diff --git a/client/scripting.c b/client/scripting.c
index d7f51c234ea0b5751ca2e82f28fe8e77ec771246..a7cf27d74ab51fbd64ab8647424624d6e56ac4cb 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -298,6 +298,7 @@ int setLuaPath( lua_State* L, const char* path )
     lua_pushstring( L, buf ); // push the new one
     lua_setfield( L, -2, "path" ); // set the field "path" in table at -2 with value at top of stack
     lua_pop( L, 1 ); // get rid of package table from top of stack
     lua_pushstring( L, buf ); // push the new one
     lua_setfield( L, -2, "path" ); // set the field "path" in table at -2 with value at top of stack
     lua_pop( L, 1 ); // get rid of package table from top of stack

+    free(buf);

     return 0; // all done!
 }
 
     return 0; // all done!
 }
 

diff --git a/client/util.c b/client/util.c
index 0dd6905e7d7754750d84a2bff4634067f2b8623a..cea9f7d734a81150d1f5536118364552dcbfa807 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -124,7 +124,7 @@ char * sprint_hex(const uint8_t * data, const size_t len) {
 
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
        
 
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
        

-       int maxLen = ( len > 1024) ? 1024 : len;
+       int maxLen = ( len > 1020) ? 1020 : len;

        static char buf[1024];
        memset(buf, 0x00, 1024);
        char *tmp = buf;
        static char buf[1024];
        memset(buf, 0x00, 1024);
        char *tmp = buf;