Unverified Commit 3a335e9d authored by James Lamb's avatar James Lamb Committed by GitHub
Browse files

changed sprintf uses to snprintf (#2920)

* [ci] changed sprintf uses to snprintf

* checked for encoding issues with snprintf
parent 7f71c96c
...@@ -376,16 +376,13 @@ inline static void Int32ToStr(int32_t value, char* buffer) { ...@@ -376,16 +376,13 @@ inline static void Int32ToStr(int32_t value, char* buffer) {
Uint32ToStr(u, buffer); Uint32ToStr(u, buffer);
} }
inline static void DoubleToStr(double value, char* buffer, size_t inline static void DoubleToStr(double value, char* buffer, size_t buffer_len) {
#ifdef _MSC_VER #ifdef _MSC_VER
buffer_len int num_chars = sprintf_s(buffer, buffer_len, "%.17g", value);
#endif
) {
#ifdef _MSC_VER
sprintf_s(buffer, buffer_len, "%.17g", value);
#else #else
sprintf(buffer, "%.17g", value); int num_chars = snprintf(buffer, buffer_len, "%.17g", value);
#endif #endif
CHECK_GE(num_chars, 0);
} }
inline static const char* SkipSpaceAndTab(const char* p) { inline static const char* SkipSpaceAndTab(const char* p) {
...@@ -420,17 +417,14 @@ struct __TToStringHelperFast { ...@@ -420,17 +417,14 @@ struct __TToStringHelperFast {
template<typename T> template<typename T>
struct __TToStringHelperFast<T, true, false> { struct __TToStringHelperFast<T, true, false> {
void operator()(T value, char* buffer, size_t void operator()(T value, char* buffer, size_t buf_len)
#ifdef _MSC_VER
buf_len
#endif
)
const { const {
#ifdef _MSC_VER #ifdef _MSC_VER
sprintf_s(buffer, buf_len, "%g", value); int num_chars = sprintf_s(buffer, buf_len, "%g", value);
#else #else
sprintf(buffer, "%g", value); int num_chars = snprintf(buffer, buf_len, "%g", value);
#endif #endif
CHECK_GE(num_chars, 0);
} }
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment