diff options
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/scriptable_handle.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/scriptable_handle.cc b/ppapi/native_client/src/trusted/plugin/scriptable_handle.cc index ef88c72..c9549a5 100644 --- a/ppapi/native_client/src/trusted/plugin/scriptable_handle.cc +++ b/ppapi/native_client/src/trusted/plugin/scriptable_handle.cc @@ -356,7 +356,7 @@ void ScriptableHandle::SetProperty(const pp::Var& name, args, exception); std::string exception_string("NULL"); - if (exception != NULL) { + if (!exception->is_undefined()) { exception_string = exception->DebugString(); } PLUGIN_PRINTF(("ScriptableHandle::SetProperty (exception=%s)\n", @@ -406,7 +406,7 @@ pp::Var ScriptableHandle::Call(const pp::Var& name, PLUGIN_PRINTF(("ScriptableHandle::Call (name=%s, %"NACL_PRIuS " args)\n", name.DebugString().c_str(), args.size())); if (plugin_ == NULL) { - pp::Var(); + return pp::Var(); } if (name.is_undefined()) // invoke default return pp::Var(); |