summaryrefslogtreecommitdiff
path: root/core/src/fxcrt
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-10 14:43:15 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-10 14:43:15 -0700
commitd794018606dfdb62f87adf065c5ba48a4607d92b (patch)
tree00072b3481bd08aab6d20b749151e2e8efb68daa /core/src/fxcrt
parent1569728e9f5a60b033e530ee1d4cd99e467649da (diff)
downloadpdfium-d794018606dfdb62f87adf065c5ba48a4607d92b.tar.xz
Better fix for snprintf non-termination on windows.
Replaces https://codereview.chromium.org/1062983002/ BUG=469244 R=brucedawson@chromium.org Review URL: https://codereview.chromium.org/1077903002
Diffstat (limited to 'core/src/fxcrt')
-rw-r--r--core/src/fxcrt/fx_basic_util.cpp18
-rw-r--r--core/src/fxcrt/fx_basic_wstring.cpp4
2 files changed, 20 insertions, 2 deletions
diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp
index 5a40c2b4be..c3df07fef5 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/src/fxcrt/fx_basic_util.cpp
@@ -169,6 +169,24 @@ FX_FLOAT FX_atof(FX_BSTR strc)
}
return bNegative ? -value : value;
}
+
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900
+void FXSYS_snprintf(char *str, size_t size, _Printf_format_string_ const char* fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ FXSYS_vsnprintf(str, size, fmt, ap);
+ va_end(ap);
+}
+void FXSYS_vsnprintf(char *str, size_t size, const char* fmt, va_list ap)
+{
+ (void) _vsnprintf(str, size, fmt, ap);
+ if (size) {
+ str[size - 1] = 0;
+ }
+}
+#endif // _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900
+
static FX_BOOL FX_IsDigit(FX_BYTE ch)
{
return (ch >= '0' && ch <= '9') ? TRUE : FALSE;
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp
index ce6a1cd763..dfdbef8bd6 100644
--- a/core/src/fxcrt/fx_basic_wstring.cpp
+++ b/core/src/fxcrt/fx_basic_wstring.cpp
@@ -976,9 +976,9 @@ void CFX_WideString::FormatV(FX_LPCWSTR lpszFormat, va_list argList)
nItemLen = nPrecision + nWidth + 128;
} else {
double f;
- char pszTemp[256] = {0};
+ char pszTemp[256];
f = va_arg(argList, double);
- FXSYS_snprintf(pszTemp, sizeof(pszTemp) - 1, "%*.*f", nWidth, nPrecision + 6, f );
+ FXSYS_snprintf(pszTemp, sizeof(pszTemp), "%*.*f", nWidth, nPrecision + 6, f );
nItemLen = (FX_STRSIZE)FXSYS_strlen(pszTemp);
}
break;