summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-09-15 16:59:44 -0700
committerLei Zhang <thestig@chromium.org>2015-09-15 16:59:44 -0700
commit4ec709d97e01f0a7ded849986f535219e5383f06 (patch)
treefdc9577e714e5941f46d93c305ba304c7eb61328
parent3c468f9d8077b00acae6dc4ed38e9638ae348924 (diff)
downloadpdfium-4ec709d97e01f0a7ded849986f535219e5383f06.tar.xz
Merge to M46: Resolve bad cast to CJS_EventHandler
At line 2026 in pdfsdk/src/javascript/PublicMethods.cpp, the writer wants to perform type cast like line 2027 but he made a mistake to make type conversion on m_pValue. Even at line 2027, it's redundant to make type conversion. The returned type of pContext->GetEventHandler() is CJS_EventHandler*. BUG=529310 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1325753007 . (cherry picked from commit 4ea0e6b972b0c6f6c9ad3f45a66a733d8dc3ca96) Review URL: https://codereview.chromium.org/1342223003 .
-rw-r--r--fpdfsdk/src/javascript/PublicMethods.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index c83ad05409..1722d0f65d 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -2023,9 +2023,8 @@ FX_BOOL CJS_PublicMethods::AFSimple_Calculate(IFXJS_Context* cc,
dValue = (double)floor(dValue * FXSYS_pow((double)10, (double)6) + 0.49) /
FXSYS_pow((double)10, (double)6);
CJS_Value jsValue(isolate, dValue);
- if ((CJS_EventHandler*)pContext->GetEventHandler()->m_pValue)
- ((CJS_EventHandler*)pContext->GetEventHandler())->Value() =
- jsValue.ToCFXWideString();
+ if (pContext->GetEventHandler()->m_pValue)
+ pContext->GetEventHandler()->Value() = jsValue.ToCFXWideString();
return TRUE;
}