summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Xu <bo_xu@foxitsoftware.com>2014-11-14 14:18:05 -0800
committerBo Xu <bo_xu@foxitsoftware.com>2014-11-14 14:22:01 -0800
commita197ba486d3b9a87956477ed867a3ebf8ee74f56 (patch)
treea24b88aecc2874f5b579f65489b8371cbd11967c
parentc706fc0cc47510bd51a107dabf7dd19bc821f360 (diff)
downloadpdfium-a197ba486d3b9a87956477ed867a3ebf8ee74f56.tar.xz
Merge to XFA: Patch from CL 705503004
Change from 'this' to L'this' and remove the cast that was hiding this mismatch. Found by VC++'s /analyze. Warning was: fpdfsdk\src\javascript\js_runtime.cpp(352) : warning C6276: Cast between semantically different string types: char * to wchar_t *. Use of invalid string can lead to undefined behavior. This mismatch has been there as far back as the history goes (to May of this year). It looks like a real bug to me. However I don't know the implications of this bug and why it would not have been noticed at run-time. The code has been this way as far back as the git history goes, but that is only to May 2014. Original patch from Bruce Dawson(brucedawson@chromium.org) BUG=427616 R=bo_xu@foxitsoftware.com Review URL: https://codereview.chromium.org/705503004
-rw-r--r--fpdfsdk/src/javascript/JS_Runtime.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index 38f45d10bf..260bf20fc0 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -370,7 +370,7 @@ void CJS_Runtime::GetObjectNames(CFX_WideStringArray& array)
array.Add(CJS_Zoomtype::m_pClassName);
array.Add(CJS_App::m_pClassName);
- array.Add((FX_LPCWSTR)"this");
+ array.Add(L"this");
array.Add(CJS_Event::m_pClassName);
array.Add(CJS_Global::m_pClassName);