Index: ppapi/native_client/src/trusted/plugin/service_runtime.cc |
=================================================================== |
--- ppapi/native_client/src/trusted/plugin/service_runtime.cc (revision 211556) |
+++ ppapi/native_client/src/trusted/plugin/service_runtime.cc (working copy) |
@@ -727,17 +727,23 @@ |
"ServiceRuntime: failed to create sel_ldr launcher"); |
return false; |
} |
+ nacl::string error_message; |
bool started = tmp_subprocess->Start(plugin_->pp_instance(), |
params.url.c_str(), |
params.uses_irt, |
params.uses_ppapi, |
params.enable_dev_interfaces, |
params.enable_dyncode_syscalls, |
- params.enable_exception_handling); |
+ params.enable_exception_handling, |
+ &error_message); |
if (!started) { |
NaClLog(LOG_ERROR, "ServiceRuntime::Start (start failed)\n"); |
- params.error_info->SetReport(ERROR_SEL_LDR_LAUNCH, |
- "ServiceRuntime: failed to start"); |
+ if (error_message.empty()) { |
+ params.error_info->SetReport(ERROR_SEL_LDR_LAUNCH, |
+ "ServiceRuntime: failed to start"); |
+ } else { |
+ params.error_info->SetReport(ERROR_SEL_LDR_LAUNCH, error_message); |
Mark Seaborn
2013/07/16 02:02:53
This error gets reported to untrusted Javascript v
halyavin
2013/07/16 08:04:35
Looks like you are right.
Mark Seaborn
2013/07/17 05:29:58
Yes, I think so, to avoid accidentally exposing se
halyavin
2013/07/17 13:12:16
Done.
|
+ } |
return false; |
} |