summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-09-15 15:42:25 -0700
committerTom Sepez <tsepez@chromium.org>2015-09-15 15:42:25 -0700
commit615d7aba0f7d53a78eb05fbd4ae0e1a7e1d3b103 (patch)
tree171a0dfc57c0740731548b2673aff2bcebc33917
parent8b1cb99abd4dcff132367fe338df38e48971bd1d (diff)
downloadpdfium-615d7aba0f7d53a78eb05fbd4ae0e1a7e1d3b103.tar.xz
Check for empty embedder data before using it in PDFium JS bindings.chromium/2510
This was guarded by an assert, but the path is hit. BUG=528015 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1345923002 .
-rw-r--r--fpdfsdk/include/javascript/JS_Define.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index ff9ab48817..4b1b224aef 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<v8::Context> context = isolate->GetCurrentContext();
v8::Local<v8::Value> v = context->GetEmbedderData(1);
+ if (v.IsEmpty())
+ return;
v8::Local<v8::External> field = v8::Local<v8::External>::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<v8::Context> context = isolate->GetCurrentContext();
v8::Local<v8::Value> v = context->GetEmbedderData(1);
+ if (v.IsEmpty())
+ return;
v8::Local<v8::External> field = v8::Local<v8::External>::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<v8::Context> context = isolate->GetCurrentContext();
v8::Local<v8::Value> v = context->GetEmbedderData(1);
+ if (v.IsEmpty())
+ return;
v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);
IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
IFXJS_Context* cc = pRuntime->GetCurrentContext();
@@ -282,6 +288,8 @@ void JSSpecialPropGet(const char* class_name,
v8::Isolate* isolate = info.GetIsolate();
v8::Local<v8::Context> context = isolate->GetCurrentContext();
v8::Local<v8::Value> v = context->GetEmbedderData(1);
+ if (v.IsEmpty())
+ return;
v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);
IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();
@@ -309,6 +317,8 @@ void JSSpecialPropPut(const char* class_name,
v8::Isolate* isolate = info.GetIsolate();
v8::Local<v8::Context> context = isolate->GetCurrentContext();
v8::Local<v8::Value> v = context->GetEmbedderData(1);
+ if (v.IsEmpty())
+ return;
v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);
IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();
@@ -333,6 +343,8 @@ void JSSpecialPropDel(const char* class_name,
v8::Isolate* isolate = info.GetIsolate();
v8::Local<v8::Context> context = isolate->GetCurrentContext();
v8::Local<v8::Value> v = context->GetEmbedderData(1);
+ if (v.IsEmpty())
+ return;
v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);
IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
IFXJS_Context* pRuntimeContext = pRuntime->GetCurrentContext();
@@ -444,6 +456,8 @@ void JSGlobalFunc(const char* func_name_string,
v8::Isolate* isolate = info.GetIsolate();
v8::Local<v8::Context> context = isolate->GetCurrentContext();
v8::Local<v8::Value> v = context->GetEmbedderData(1);
+ if (v.IsEmpty())
+ return;
v8::Local<v8::External> field = v8::Local<v8::External>::Cast(v);
IFXJS_Runtime* pRuntime = (IFXJS_Runtime*)field->Value();
IFXJS_Context* cc = pRuntime->GetCurrentContext();