Kill remaining sprintfs

I thought I had done this already, apart from the third-party
libraries, but there were a couple remaining (the third-party
libraries will still call this, they should be tweaked
upstream as needed).

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/999543002

5 files changed, 23 insertions, 13 deletions

diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index b31a60396b..a875da5f9c 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/include/fxcrt/fx_system.h
@@ -139,11 +139,13 @@ typedef FX_UINT64				FX_QWORD;
 #define FX_PI	3.1415926535897932384626433832795f
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define FXSYS_snprintf	_snprintf
+#define FXSYS_vsnprintf	_vsnprintf
 #else
 #define FXSYS_snprintf	snprintf
+#define FXSYS_vsnprintf	vsnprintf
 #endif
-#define FXSYS_sprintf	sprintf
-#define FXSYS_vsprintf	vsprintf
+#define FXSYS_sprintf	DO_NOT_USE_SPRINTF_DIE_DIE_DIE
+#define FXSYS_vsprintf	DO_NOT_USE_VSPRINTF_DIE_DIE_DIE
 #define FXSYS_strchr	strchr
 #define FXSYS_strlen	strlen
 #define FXSYS_strncmp	strncmp
diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jerror.c b/core/src/fxcodec/libjpeg/fpdfapi_jerror.c
index 943ced798f..282f889ebd 100644
--- a/core/src/fxcodec/libjpeg/fpdfapi_jerror.c
+++ b/core/src/fxcodec/libjpeg/fpdfapi_jerror.c
@@ -177,9 +177,9 @@ format_message (j_common_ptr cinfo, char * buffer)
 
   /* Format the message into the passed buffer */
   if (isstring)
-    FXSYS_sprintf(buffer, msgtext, err->msg_parm.s);
+    sprintf(buffer, msgtext, err->msg_parm.s);
   else
-    FXSYS_sprintf(buffer, msgtext,
+    sprintf(buffer, msgtext,
 	    err->msg_parm.i[0], err->msg_parm.i[1],
 	    err->msg_parm.i[2], err->msg_parm.i[3],
 	    err->msg_parm.i[4], err->msg_parm.i[5],
diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp
index 5c8a2fa8f3..895c8e560e 100644
--- a/core/src/fxcrt/fx_basic_bstring.cpp
+++ b/core/src/fxcrt/fx_basic_bstring.cpp
@@ -676,10 +676,10 @@ void CFX_ByteString::FormatV(FX_LPCSTR lpszFormat, va_list argList)
                     if (nWidth + nPrecision > 100) {
                         nItemLen = nPrecision + nWidth + 128;
                     } else {
-                        double f;
                         char pszTemp[256];
-                        f = va_arg(argList, double);
-                        FXSYS_sprintf(pszTemp, "%*.*f", nWidth, nPrecision + 6, f );
+                        double f = va_arg(argList, double);
+                        memset(pszTemp, 0, sizeof(pszTemp));
+                        FXSYS_snprintf(pszTemp, sizeof(pszTemp) - 1, "%*.*f", nWidth, nPrecision + 6, f);
                         nItemLen = (FX_STRSIZE)FXSYS_strlen(pszTemp);
                     }
                     break;
@@ -697,9 +697,11 @@ void CFX_ByteString::FormatV(FX_LPCSTR lpszFormat, va_list argList)
         }
         nMaxLen += nItemLen;
     }
+    nMaxLen += 32;  // Fudge factor.
     GetBuffer(nMaxLen);
     if (m_pData) {
-        FXSYS_vsprintf(m_pData->m_String, lpszFormat, argListSave);
+        memset(m_pData->m_String, 0, nMaxLen);
+        FXSYS_vsnprintf(m_pData->m_String, nMaxLen - 1, lpszFormat, argListSave);
         ReleaseBuffer();
     }
     va_end(argListSave);
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 401f817be2..09690d3345 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -411,7 +411,8 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, FPDF_PAGE page, int start_x, int
 #ifdef DEBUG_TRACE
 	{
 		char str[128];
-		sprintf(str, "Rendering DIB %d x %d", width, height);
+		memset(str, 0, sizeof(str));
+		FXSYS_snprintf(str, sizeof(str) - 1, "Rendering DIB %d x %d", width, height);
 		CPDF_ModuleMgr::Get()->ReportError(999, str);
 	}
 #endif
@@ -429,7 +430,8 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, FPDF_PAGE page, int start_x, int
 	if (pContext->m_hBitmap == NULL) {
 #if defined(DEBUG) || defined(_DEBUG)
 		char str[128];
-		sprintf(str, "Error CreateDIBSection: %d x %d, error code = %d", width, height, GetLastError());
+		memset(str, 0, sizeof(str));
+		FXSYS_snprintf(str, sizeof(str) - 1, "Error CreateDIBSection: %d x %d, error code = %d", width, height, GetLastError());
 		CPDF_ModuleMgr::Get()->ReportError(FPDFERR_OUT_OF_MEMORY, str);
 #else
 		CPDF_ModuleMgr::Get()->ReportError(FPDFERR_OUT_OF_MEMORY, NULL);
@@ -465,7 +467,8 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, FPDF_PAGE page, int start_x, int
 	if (hMemDC == NULL) {
 #if defined(DEBUG) || defined(_DEBUG)
 		char str[128];
-		sprintf(str, "Error CreateCompatibleDC. Error code = %d", GetLastError());
+		memset(str, 0, sizeof(str));
+		FXSYS_snprintf(str, sizeof(str) - 1, "Error CreateCompatibleDC. Error code = %d", GetLastError());
 		CPDF_ModuleMgr::Get()->ReportError(FPDFERR_OUT_OF_MEMORY, str);
 #else
 		CPDF_ModuleMgr::Get()->ReportError(FPDFERR_OUT_OF_MEMORY, NULL);
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index 8265662be3..7848740510 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -357,13 +357,16 @@ CFX_ByteString CPDFSDK_DateTime::ToPDFDateTimeString()
 {
 	CFX_ByteString dtStr;
 	char tempStr[32];
-	sprintf(tempStr, "D:%04d%02d%02d%02d%02d%02d", dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second);
+	memset(tempStr, 0, sizeof(tempStr));
+	FXSYS_snprintf(tempStr, sizeof(tempStr) - 1, "D:%04d%02d%02d%02d%02d%02d",
+                   dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second);
 	dtStr = CFX_ByteString(tempStr);
 	if (dt.tzHour < 0)
 		dtStr += CFX_ByteString("-");
 	else
 		dtStr += CFX_ByteString("+");
-	sprintf(tempStr, "%02d'%02d'", abs(dt.tzHour), dt.tzMinute);
+	memset(tempStr, 0, sizeof(tempStr));
+	FXSYS_snprintf(tempStr, sizeof(tempStr) - 1, "%02d'%02d'", abs(dt.tzHour), dt.tzMinute);
 	dtStr += CFX_ByteString(tempStr);
 	return dtStr;
 }