diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-07-23 23:12:14 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-23 23:12:14 +0000 |
| commit | c62aa207e9acb919c33df5f3694fe159619dda86 (patch) | |
| tree | 8584f29b95261d6504e5a88679c12140928b22a1 /fxjs | |
| parent | 1116ef0b1c45a4968d45a21d995193a7670126b3 (diff) | |
| download | pdfium-c62aa207e9acb919c33df5f3694fe159619dda86.tar.xz | |
Tighten up ThisProxy casts.
Previous CLs have shown that the "lpClass" checks aren't sufficient
here, so ensure we are always checking C++ enum value before
downcasting this type.
Change-Id: I418127c5e7131e0a3363363a60d1976719d6837c
Reviewed-on: https://pdfium-review.googlesource.com/38550
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs')
| -rw-r--r-- | fxjs/cfxjse_engine.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/cfxjse_engine.cpp index 3efe335d67..c5cc89a8d0 100644 --- a/fxjs/cfxjse_engine.cpp +++ b/fxjs/cfxjse_engine.cpp @@ -66,7 +66,10 @@ namespace { const char kFormCalcRuntime[] = "pfm_rt"; CXFA_ThisProxy* ToThisProxy(CFXJSE_Value* pValue) { - return static_cast<CXFA_ThisProxy*>(pValue->ToHostObject()); + CFXJSE_HostObject* pHostObject = pValue->ToHostObject(); + if (!pHostObject) + return nullptr; + return CXFA_ThisProxy::FromCXFAObject(pHostObject->AsCXFAObject()); } } // namespace @@ -470,10 +473,10 @@ CFXJSE_Context* CFXJSE_Engine::CreateVariablesContext(CXFA_Node* pScriptNode, CXFA_Object* CFXJSE_Engine::GetVariablesThis(CXFA_Object* pObject, bool bScriptNode) { - if (!pObject->IsVariablesThis()) + CXFA_ThisProxy* pProxy = CXFA_ThisProxy::FromCXFAObject(pObject); + if (!pProxy) return pObject; - CXFA_ThisProxy* pProxy = static_cast<CXFA_ThisProxy*>(pObject); return bScriptNode ? pProxy->GetScriptNode() : pProxy->GetThisNode(); } |