BUGS: more Coverity scan fixes.

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 2fb50a47ea2e4cee910a84c333f4f90d28153ece..51fafdebc22b3b872a8a6b1cba3a9f34bfc2567e 100644 (file)
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -173,7 +173,7 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
        // parity bytes
        if (iLen != 0) {
                if (parity != NULL) {
-               memcpy(trace + traceLen, parity, num_paritybytes);
+                       memcpy(trace + traceLen, parity, num_paritybytes);
                } else {
                        memset(trace + traceLen, 0x00, num_paritybytes);
                }

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index a4986f6bf28ffe591ea568eeaf73882b35df5037..1b815326e13e26f611a169a059702193455f9b83 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1202,7 +1202,7 @@ int CmdHF14AMfELoad(const char *Cmd)
        \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
@@ -1593,6 +1593,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                        \r
                        if (fgets(buf, sizeof(buf), f) == NULL) {\r
                                PrintAndLog("File reading error.");\r
+                               fclose(f);\r
                                return 2;\r
                        }\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
+                               fclose(f);\r
                                return 2;\r
                        }\r
                        for (i = 0; i < 32; i += 2)\r

diff --git a/client/cmdscript.c b/client/cmdscript.c
index 928a216d7334bc72cf52f4b457f12ecbb111683c..fd02d13a9151b10c01a1249ca712013cb8a463ed 100644 (file)
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -83,7 +83,7 @@ int CmdList(const char *Cmd)
     {
         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);

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 873213d1b549a14618e6736af9bbaa4e168b907a..d754b06b4a1a01dd589c6523bc354fdd0c99566d 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -356,10 +356,7 @@ int loadTraceCard(uint8_t *tuid) {
        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
@@ -396,10 +393,7 @@ int saveTraceCard(void) {
        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

diff --git a/client/scripting.c b/client/scripting.c
index 15c336ff8a3351e9c1ed5fa58027f98f41da77fd..880b7cb2ffecea9741fad613a3f64d3cae380496 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -341,7 +341,8 @@ 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
-    return 0; // all done!
+    free(buf);
+       return 0; // all done!
 }
 
 

diff --git a/client/util.c b/client/util.c
index 382c85c6a64362216c18b3f0dd73a88d5db1ea0c..1c8081bf2370f342437ab2b16276cd5824dea2dd 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) {
        
-       int maxLen = ( len > 1024) ? 1024 : len;
+       int maxLen = ( len > 1020) ? 1020 : len;
        static char buf[1024];
        memset(buf, 0x00, 1024);
        char *tmp = buf;