diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-05-11 10:46:19 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-05-11 10:46:19 +0000 |
commit | 82d4f4c983f3588220149a076ebea3eb7d6b50a9 (patch) | |
tree | 39655ecad077b3474d3193d5c588d1ab84d7dc45 /fastos | |
parent | 4387193d3d34caa1e2bb6223a46f6d743bed407c (diff) |
Help compiler understand that we are within bounds
Diffstat (limited to 'fastos')
-rw-r--r-- | fastos/src/tests/filetest.cpp | 4 | ||||
-rw-r--r-- | fastos/src/tests/tests.h | 42 | ||||
-rw-r--r-- | fastos/src/vespa/fastos/timestamp.cpp | 2 |
3 files changed, 24 insertions, 24 deletions
diff --git a/fastos/src/tests/filetest.cpp b/fastos/src/tests/filetest.cpp index e063ccbc89d..43051dd1667 100644 --- a/fastos/src/tests/filetest.cpp +++ b/fastos/src/tests/filetest.cpp @@ -59,8 +59,8 @@ public: char file3[1024]; char file4[1024]; char file5[1024]; - char subdir1[1024]; - char subdir2[1024]; + char subdir1[512]; + char subdir2[512]; sprintf(file1, "%s%sfile1", dirName, FastOS_File::GetPathSeparator()); sprintf(file2, "%s%sfile2", dirName, FastOS_File::GetPathSeparator()); sprintf(file3, "%s%sfile2", dirName, FastOS_File::GetPathSeparator()); diff --git a/fastos/src/tests/tests.h b/fastos/src/tests/tests.h index 62a873f8a54..868109a28ee 100644 --- a/fastos/src/tests/tests.h +++ b/fastos/src/tests/tests.h @@ -43,7 +43,7 @@ public: bool Progress (bool result, const char *str) { char string[MAX_STR_LEN]; - sprintf(string, "%s: %s\n", + snprintf(string, sizeof(string) - 1, "%s: %s\n", result ? okString : failString, str); PrintProgress(string); if (! result) { _allOkFlag = false; } @@ -52,71 +52,71 @@ public: bool Progress (bool result, const char *str, int d1) { - char string[MAX_STR_LEN]; - sprintf(string, str, d1); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, d1); return Progress(result, string); } bool Progress (bool result, const char *str, int d1, int d2) { - char string[MAX_STR_LEN]; - sprintf(string, str, d1, d2); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, d1, d2); return Progress(result, string); } bool Progress (bool result, const char *str, const char *s1) { - char string[MAX_STR_LEN]; - sprintf(string, str, s1); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, s1); return Progress(result, string); } bool Progress (bool result, const char *str, const FastOS_ThreadInterface *s1) { - char string[MAX_STR_LEN]; - sprintf(string, str, s1); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, s1); return Progress(result, string); } bool Progress (bool result, const char *str, const FastOS_Socket *s1) { - char string[MAX_STR_LEN]; - sprintf(string, str, s1); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, s1); return Progress(result, string); } bool Progress (bool result, const char *str, const char *s1, const char *s2) { - char string[MAX_STR_LEN]; - sprintf(string, str, s1, s2); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, s1, s2); return Progress(result, string); } bool Progress (bool result, const char *str, const char *s1, int d1) { - char string[MAX_STR_LEN]; - sprintf(string, str, s1, d1); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, s1, d1); return Progress(result, string); } bool Progress (bool result, const char *str, int d1, const char *s1) { - char string[MAX_STR_LEN]; - sprintf(string, str, d1, s1); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, d1, s1); return Progress(result, string); } bool ProgressI64 (bool result, const char *str, int64_t val) { - char string[MAX_STR_LEN]; - sprintf(string, str, val); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, val); return Progress(result, string); } bool ProgressFloat (bool result, const char *str, float val) { - char string[MAX_STR_LEN]; - sprintf(string, str, val); + char string[MAX_STR_LEN-100]; + snprintf(string, sizeof(string) - 1, str, val); return Progress(result, string); } diff --git a/fastos/src/vespa/fastos/timestamp.cpp b/fastos/src/vespa/fastos/timestamp.cpp index f967ea5aade..a662dd32a21 100644 --- a/fastos/src/vespa/fastos/timestamp.cpp +++ b/fastos/src/vespa/fastos/timestamp.cpp @@ -23,7 +23,7 @@ TimeStamp::asString(double timeInSeconds) gmtime_r(&timeStamp, &timeStruct); char timeString[128]; strftime(timeString, sizeof(timeString), "%F %T", &timeStruct); - char retval[128]; + char retval[160]; uint32_t milliSeconds = std::min((uint32_t)(fractpart * 1000.0), 999u); snprintf(retval, sizeof(retval), "%s.%03u UTC", timeString, milliSeconds); return std::string(retval); |