From 72a40ab98c3ade8f362bba7d7d80783058319e6d Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 21 Sep 2015 14:15:27 -0700 Subject: Merge to M46: Check for empty embedder data before using it in PDFium JS bindings. This was guarded by an assert, but the path is hit. BUG=528015 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1345923002 . (cherry picked from commit 615d7aba0f7d53a78eb05fbd4ae0e1a7e1d3b103) Review URL: https://codereview.chromium.org/1357313002 . --- fpdfsdk/include/javascript/JS_Define.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index db4b1c360d..b384f3ad34 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -83,6 +83,8 @@ void JSPropGetter(const char* prop_name_string, v8::Isolate* isolate = info.GetIsolate(); v8::Local context = isolate->GetCurrentContext(); v8::Local v = context->GetEmbedderData(1); + if (v.IsEmpty()) + return; v8::Local field = v8::Local::Cast(v); IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value(); IFXJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -111,6 +113,8 @@ void JSPropSetter(const char* prop_name_string, v8::Isolate* isolate = info.GetIsolate(); v8::Local context = isolate->GetCurrentContext(); v8::Local v = context->GetEmbedderData(1); + if (v.IsEmpty()) + return; v8::Local field = v8::Local::Cast(v); IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value(); IFXJS_Context* pContext = pRuntime->GetCurrentContext(); @@ -153,6 +157,8 @@ void JSMethod(const char* method_name_string, v8::Isolate* isolate = info.GetIsolate(); v8::Local context = isolate->GetCurrentContext(); v8::Local v = context->GetEmbedderData(1); + if (v.IsEmpty()) + return; v8::Local field = v8::Local::Cast(v); IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value(); IFXJS_Context* cc = pRuntime->GetCurrentContext(); @@ -303,6 +309,8 @@ void JSSpecialPropGet(const char* class_name, v8::Isolate* isolate = info.GetIsolate(); v8::Local context = isolate->GetCurrentContext(); v8::Local v = context->GetEmbedderData(1); + if (v.IsEmpty()) + return; v8::Local field = v8::Local::Cast(v); IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value(); IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext(); @@ -330,6 +338,8 @@ void JSSpecialPropPut(const char* class_name, v8::Isolate* isolate = info.GetIsolate(); v8::Local context = isolate->GetCurrentContext(); v8::Local v = context->GetEmbedderData(1); + if (v.IsEmpty()) + return; v8::Local field = v8::Local::Cast(v); IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value(); IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext(); @@ -354,6 +364,8 @@ void JSSpecialPropDel(const char* class_name, v8::Isolate* isolate = info.GetIsolate(); v8::Local context = isolate->GetCurrentContext(); v8::Local v = context->GetEmbedderData(1); + if (v.IsEmpty()) + return; v8::Local field = v8::Local::Cast(v); IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value(); IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext(); @@ -479,6 +491,8 @@ void JSGlobalFunc(const char* func_name_string, v8::Isolate* isolate = info.GetIsolate(); v8::Local context = isolate->GetCurrentContext(); v8::Local v = context->GetEmbedderData(1); + if (v.IsEmpty()) + return; v8::Local field = v8::Local::Cast(v); IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value(); IFXJS_Context* cc = pRuntime->GetCurrentContext(); -- cgit v1.2.3