From 39a076f19c05ac1ebb4f1dd15f9835ffb8611ae0 Mon Sep 17 00:00:00 2001
From: Ryan Harrison <rharrison@chromium.org>
Date: Thu, 7 Dec 2017 18:18:14 +0000
Subject: Fix WideString::Format instances that should use %ls

BUG=pdfium:951

Change-Id: I4b82ce81c8db3f00fa2341c6fb853ed84814e5e5
Reviewed-on: https://pdfium-review.googlesource.com/20510
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
---
 core/fxcrt/xml/cfx_xmldoc.cpp       | 2 +-
 core/fxcrt/xml/cfx_xmlnode.cpp      | 2 +-
 fxjs/cjs_runtime.cpp                | 2 +-
 xfa/fwl/cfwl_monthcalendar.cpp      | 2 +-
 xfa/fxfa/cxfa_fftextedit.cpp        | 2 +-
 xfa/fxfa/parser/cxfa_nodehelper.cpp | 7 ++++---
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/fxcrt/xml/cfx_xmldoc.cpp b/core/fxcrt/xml/cfx_xmldoc.cpp
index e29c09a08e..36c3606017 100644
--- a/core/fxcrt/xml/cfx_xmldoc.cpp
+++ b/core/fxcrt/xml/cfx_xmldoc.cpp
@@ -68,7 +68,7 @@ void CFX_XMLDoc::SaveXMLNode(
         pXMLStream->WriteString(ws.AsStringView());
       } else {
         WideString ws =
-            WideString::Format(L"<?%s", pInstruction->GetName().c_str());
+            WideString::Format(L"<?%ls", pInstruction->GetName().c_str());
         pXMLStream->WriteString(ws.AsStringView());
 
         for (auto it : pInstruction->GetAttributes()) {
diff --git a/core/fxcrt/xml/cfx_xmlnode.cpp b/core/fxcrt/xml/cfx_xmlnode.cpp
index 601999cbad..41889e2d1c 100644
--- a/core/fxcrt/xml/cfx_xmlnode.cpp
+++ b/core/fxcrt/xml/cfx_xmlnode.cpp
@@ -347,7 +347,7 @@ void CFX_XMLNode::SaveXMLNode(
         ws += L"\"?>";
         pXMLStream->WriteString(ws.AsStringView());
       } else {
-        ws = WideString::Format(L"<?%s", pInstruction->GetName().c_str());
+        ws = WideString::Format(L"<?%ls", pInstruction->GetName().c_str());
         pXMLStream->WriteString(ws.AsStringView());
 
         for (auto it : pInstruction->GetAttributes()) {
diff --git a/fxjs/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp
index 87224af8e2..c8e95e16e5 100644
--- a/fxjs/cjs_runtime.cpp
+++ b/fxjs/cjs_runtime.cpp
@@ -208,7 +208,7 @@ int CJS_Runtime::ExecuteScript(const WideString& script, WideString* info) {
   FXJSErr error = {};
   int nRet = Execute(script, &error);
   if (nRet < 0) {
-    *info = WideString::Format(L"[ Line: %05d { %s } ] : %s", error.linnum - 1,
+    *info = WideString::Format(L"[ Line: %05d { %ls } ] : %s", error.linnum - 1,
                                error.srcline, error.message);
   }
   return nRet;
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
index 5f23a1e8e9..08ed83f4f1 100644
--- a/xfa/fwl/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -677,7 +677,7 @@ WideString CFWL_MonthCalendar::GetHeadText(int32_t iYear, int32_t iMonth) {
                                           L"April",   L"May",      L"June",
                                           L"July",    L"August",   L"September",
                                           L"October", L"November", L"December"};
-  return WideString::Format(L"%s, %d", pMonth[iMonth - 1], iYear);
+  return WideString::Format(L"%ls, %d", pMonth[iMonth - 1], iYear);
 }
 
 WideString CFWL_MonthCalendar::GetTodayText(int32_t iYear,
diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp
index 88567213ca..ea9e4dbe36 100644
--- a/xfa/fxfa/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -203,7 +203,7 @@ void CXFA_FFTextEdit::ValidateNumberField(const WideString& wsText) {
   WideString wsSomField;
   pAcc->GetNode()->GetSOMExpression(wsSomField);
 
-  pAppProvider->MsgBox(WideString::Format(L"%s can not contain %s",
+  pAppProvider->MsgBox(WideString::Format(L"%ls can not contain %ls",
                                           wsText.c_str(), wsSomField.c_str()),
                        pAppProvider->GetAppTitle(), XFA_MBICON_Error,
                        XFA_MB_OK);
diff --git a/xfa/fxfa/parser/cxfa_nodehelper.cpp b/xfa/fxfa/parser/cxfa_nodehelper.cpp
index e3d6aa0bb5..3324a9ba3d 100644
--- a/xfa/fxfa/parser/cxfa_nodehelper.cpp
+++ b/xfa/fxfa/parser/cxfa_nodehelper.cpp
@@ -256,14 +256,15 @@ void CXFA_NodeHelper::GetNameExpression(CXFA_Node* refNode,
       (bIsProperty && refNode->GetElementType() != XFA_Element::PageSet)) {
     ws = refNode->GetClassName();
     wsName =
-        WideString::Format(L"#%s[%d]", ws.c_str(),
+        WideString::Format(L"#%ls[%d]", ws.c_str(),
                            GetIndex(refNode, eLogicType, bIsProperty, true));
     return;
   }
   ws = refNode->JSNode()->GetCData(XFA_Attribute::Name);
   ws.Replace(L".", L"\\.");
-  wsName = WideString::Format(
-      L"%s[%d]", ws.c_str(), GetIndex(refNode, eLogicType, bIsProperty, false));
+  wsName =
+      WideString::Format(L"%ls[%d]", ws.c_str(),
+                         GetIndex(refNode, eLogicType, bIsProperty, false));
 }
 
 bool CXFA_NodeHelper::NodeIsTransparent(CXFA_Node* refNode) {
-- 
cgit v1.2.3