summaryrefslogtreecommitdiff
path: root/fpdfsdk/cpdfsdk_formfillenvironment.cpp
diff options
context:
space:
mode:
authorJane Liu <janeliulwq@google.com>2017-07-19 13:10:50 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-07-19 19:09:39 +0000
commit67ccef73bf664b7cdb4c6eed7acbaa4163c22a80 (patch)
tree718061bc21fd52eab1bc70a8b9be97585f1d79f8 /fpdfsdk/cpdfsdk_formfillenvironment.cpp
parenteed247e9cb3b0e9ce5dcb8bf6ee7673c9dd3e544 (diff)
downloadpdfium-67ccef73bf664b7cdb4c6eed7acbaa4163c22a80.tar.xz
Use CFX_WideString in CPDF_NameTree functions to strip BOMchromium/3162
PDFium doesn't strip BOMs during parsing, but we should strip BOMs when retrieving parsed strings in CPDF_NameTree to ensure consistency and appropriate function behavior. See the bug for more info. As outlined in Bug=pdfium:593, the solution is to call GetUnicodeText() instead of GetString(). I added a GetUnicodeTextAt() function in CPDF_Array, which is symmetrical to GetUnicodeTextFor() in CPDF_Dictionary. I then changed the input variable types to CPDF_NameTree functions to be CFX_WideString instead of CFX_ByteString, and modified all the calls to them. I also added a unit test for nametree, which would fail prior to this change. Nametrees with non-unicode names are already tested by embedder tests. Bug=pdfium:820 Change-Id: Id69d7343632f83d1f5180348c0eea290f478183f Reviewed-on: https://pdfium-review.googlesource.com/8091 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Jane Liu <janeliulwq@google.com>
Diffstat (limited to 'fpdfsdk/cpdfsdk_formfillenvironment.cpp')
-rw-r--r--fpdfsdk/cpdfsdk_formfillenvironment.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index b0ee903ead..de7947556d 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -603,10 +603,9 @@ void CPDFSDK_FormFillEnvironment::ProcJavascriptFun() {
CPDF_DocJSActions docJS(pPDFDoc);
int iCount = docJS.CountJSActions();
for (int i = 0; i < iCount; i++) {
- CFX_ByteString csJSName;
+ CFX_WideString csJSName;
CPDF_Action jsAction = docJS.GetJSActionAndName(i, &csJSName);
- GetActionHandler()->DoAction_JavaScript(
- jsAction, CFX_WideString::FromLocal(csJSName.AsStringC()), this);
+ GetActionHandler()->DoAction_JavaScript(jsAction, csJSName, this);
}
}