Check for the existence of "ipc" object

zcbenz · zcbenz · commit ad16e9ea4937 · 2015-01-26T18:47:23.000-08:00
diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc
@@ -29,10 +29,15 @@ namespace atom {
 
 namespace {
 
-v8::Handle<v8::Object> GetIPCObject(v8::Isolate* isolate,
-                                    v8::Handle<v8::Context> context) {
+bool GetIPCObject(v8::Isolate* isolate,
+                  v8::Handle<v8::Context> context,
+                  v8::Handle<v8::Object>* ipc) {
   v8::Handle<v8::String> key = mate::StringToV8(isolate, "ipc");
-  return context->Global()->GetHiddenValue(key)->ToObject();
+  v8::Handle<v8::Value> value = context->Global()->GetHiddenValue(key);
+  if (value.IsEmpty() || !value->IsObject())
+    return false;
+  *ipc = value->ToObject();
+  return true;
 }
 
 std::vector<v8::Handle<v8::Value>> ListValueToVector(
@@ -118,8 +123,9 @@ void AtomRenderViewObserver::OnBrowserMessage(const base::string16& channel,
       isolate, args);
   arguments.insert(arguments.begin(), mate::ConvertToV8(isolate, channel));
 
-  v8::Handle<v8::Object> ipc = GetIPCObject(isolate, context);
-  node::MakeCallback(isolate, ipc, "emit", arguments.size(), &arguments[0]);
+  v8::Handle<v8::Object> ipc;
+  if (GetIPCObject(isolate, context, &ipc))
+    node::MakeCallback(isolate, ipc, "emit", arguments.size(), &arguments[0]);
 }
 
 }  // namespace atom
