check frame in GetCurrentRenderView

rogerwang · rogerwang · commit ccbf73023dda · 2014-12-16T23:30:24.000+08:00
diff --git a/src/api/bindings_common.cc b/src/api/bindings_common.cc
@@ -40,7 +40,7 @@ using blink::WebView;
 namespace {
 RenderView* GetRenderView(v8::Handle<v8::Context> ctx) {
   WebLocalFrame* frame = WebLocalFrame::frameForContext(ctx);
-  if (!frame)
+  if (!frame || !frame->isNodeJS())
     return NULL;
 
   WebView* view = frame->view();
diff --git a/src/api/dispatcher_bindings.cc b/src/api/dispatcher_bindings.cc
@@ -453,6 +453,13 @@ void DispatcherBindings::CallStaticMethod(
 // static
 void DispatcherBindings::CrashRenderer(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
+  v8::Isolate* isolate = v8::Isolate::GetCurrent();
+  RenderView* render_view = GetCurrentRenderView();
+  if (!render_view) {
+    args.GetReturnValue().Set(isolate->ThrowException(v8::Exception::Error(v8::String::NewFromUtf8(isolate,
+                                     "Unable to get render view in CallObjectMethod"))));
+    return;
+  }
   int* ptr = NULL;
   *ptr = 1;
 }
