diff options
| author | Jamie Pate <jpate@fortinet.com> | 2019-11-05 13:04:04 -0800 |
|---|---|---|
| committer | Jamie Pate <jpate@fortinet.com> | 2019-11-07 16:23:35 -0800 |
| commit | bdb7adecfb2834640279a26886ff110693e43910 (patch) | |
| tree | a3ff6c461a69bcb89e1e517b2dccda744a9794ee | |
| parent | 245c99175c242bdc60a212cc84986b1a9ad5aa08 (diff) | |
Fix #24137 Different number of leading zeros on MINGW printf("%lg")
Use _set_output_format() on MINGW platform to force _snprintf_s() to
conform to the C99 standard and match the other platforms.
Fixes #24137
| -rw-r--r-- | core/ustring.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index 7ee2fee312..7850c6774c 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -1337,7 +1337,17 @@ String String::num_scientific(double p_num) { char buf[256]; #if defined(__GNUC__) || defined(_MSC_VER) + +#if (defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900)) && defined(_TWO_DIGIT_EXPONENT) + // MinGW and old MSC require _set_output_format() to conform to C99 output for printf + unsigned int old_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT); +#endif snprintf(buf, 256, "%lg", p_num); + +#if (defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900)) && defined(_TWO_DIGIT_EXPONENT) + _set_output_format(old_exponent_format); +#endif + #else sprintf(buf, "%.16lg", p_num); #endif |