Fix memory bounds error

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 553803c1ef371f2d6bbcb069733bd785b67b0406..83060b0149c79ee1fd33dc6d9cf09903b6d1ea03 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -533,7 +533,7 @@ static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, boo
        char ctmp3[3] = {0};\r
        int len = param_getlength(Cmd, indx);\r
        if (len > 0 && len < 4){\r
        char ctmp3[3] = {0};\r
        int len = param_getlength(Cmd, indx);\r
        if (len > 0 && len < 4){\r

-               param_getstr(Cmd, indx, ctmp3);\r
+               param_getstr(Cmd, indx, ctmp3, sizeof(ctmp3));\r

                \r
                *paramT |= (ctmp3[0] == 't' || ctmp3[0] == 'T');\r
                *paramD |= (ctmp3[0] == 'd' || ctmp3[0] == 'D');\r
                \r
                *paramT |= (ctmp3[0] == 't' || ctmp3[0] == 'T');\r
                *paramD |= (ctmp3[0] == 'd' || ctmp3[0] == 'D');\r


@@ -1043,7 +1043,7 @@ int CmdHF14AMfChk(const char *Cmd)
        // double parameters - ts, ds\r
        int clen = param_getlength(Cmd, 2);\r
        if (clen == 2 || clen == 3){\r
        // double parameters - ts, ds\r
        int clen = param_getlength(Cmd, 2);\r
        if (clen == 2 || clen == 3){\r

-               param_getstr(Cmd, 2, ctmp3);\r
+               param_getstr(Cmd, 2, ctmp3, sizeof(ctmp3));\r

                ctmp = ctmp3[1];\r
        }\r
        //parse\r
                ctmp = ctmp3[1];\r
        }\r
        //parse\r


@@ -1075,7 +1075,7 @@ int CmdHF14AMfChk(const char *Cmd)
                        keycnt++;\r
                } else {\r
                        // May be a dic file\r
                        keycnt++;\r
                } else {\r
                        // May be a dic file\r

-                       if ( param_getstr(Cmd, 2 + i,filename) >= FILE_PATH_SIZE ) {\r
+                       if ( param_getstr(Cmd, 2 + i, filename, sizeof(filename)) >= FILE_PATH_SIZE ) {\r

                                PrintAndLog("File name too long");\r
                                free(keyBlock);\r
                                return 2;\r
                                PrintAndLog("File name too long");\r
                                free(keyBlock);\r
                                return 2;\r


@@ -1398,7 +1398,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        break;\r
                case 'f':\r
                case 'F':\r
                        break;\r
                case 'f':\r
                case 'F':\r

-                       len = param_getstr(Cmd, cmdp+1, filename);\r
+                       len = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));\r

                        if (len < 1) {\r
                                PrintAndLog("error no filename found");\r
                                return 0;\r
                        if (len < 1) {\r
                                PrintAndLog("error no filename found");\r
                                return 0;\r


@@ -1674,7 +1674,7 @@ int CmdHF14AMfELoad(const char *Cmd)
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       len = param_getstr(Cmd,nameParamNo,filename);\r
+       len = param_getstr(Cmd,nameParamNo,filename,sizeof(filename));\r

 \r
        if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
 \r
 \r
        if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
 \r


@@ -1773,7 +1773,7 @@ int CmdHF14AMfESave(const char *Cmd)
                }\r
        }\r
 \r
                }\r
        }\r
 \r

-       len = param_getstr(Cmd,nameParamNo,filename);\r
+       len = param_getstr(Cmd,nameParamNo,filename,sizeof(filename));\r

 \r
        if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
 \r
 \r
        if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
 \r


@@ -2137,7 +2137,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                }\r
                return 0;\r
        } else {\r
                }\r
                return 0;\r
        } else {\r

-               param_getstr(Cmd, 0, filename);\r
+               param_getstr(Cmd, 0, filename, sizeof(filename));\r

 \r
                len = strlen(filename);\r
                if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
 \r
                len = strlen(filename);\r
                if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r


@@ -2348,7 +2348,7 @@ int CmdHF14AMfCSave(const char *Cmd) {
                }\r
                return 0;\r
        } else {\r
                }\r
                return 0;\r
        } else {\r

-               param_getstr(Cmd, 0, filename);\r
+               param_getstr(Cmd, 0, filename, sizeof(filename));\r

 \r
                len = strlen(filename);\r
                if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
 \r
                len = strlen(filename);\r
                if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r