Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Unified Diff: components/nacl/loader/nacl_helper_linux.cc

Issue 230413002: NonSFI NaCl: Plumb Exception IRT enough for breakpad. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: only run the test on x86 linux, other architectures are not supported. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/nacl/loader/nacl_helper_linux.cc
diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
index 15f58eb3a5fba07e50a7b578f240a261be23384e..d41e612584fda2b49ca150c9668b8c9aa8b03e5b 100644
--- a/components/nacl/loader/nacl_helper_linux.cc
+++ b/components/nacl/loader/nacl_helper_linux.cc
@@ -33,6 +33,7 @@
#include "components/nacl/common/nacl_switches.h"
#include "components/nacl/loader/nacl_listener.h"
#include "components/nacl/loader/nacl_sandbox_linux.h"
+#include "components/nacl/loader/nonsfi/irt_exception_handling.h"
#include "components/nacl/loader/nonsfi/nonsfi_sandbox.h"
#include "content/public/common/zygote_fork_delegate_linux.h"
#include "crypto/nss_util.h"
@@ -123,6 +124,9 @@ void BecomeNaClLoader(const std::vector<int>& child_fds,
// don't need zygote FD any more
if (IGNORE_EINTR(close(kNaClZygoteDescriptor)) != 0)
LOG(ERROR) << "close(kNaClZygoteDescriptor) failed.";
+ if (uses_nonsfi_mode) {
hidehiko 2014/04/22 00:22:37 Let's drop '{}' to follow the style around here.
Junichi Uekawa 2014/04/22 04:57:01 Done.
+ nacl::nonsfi::InitializeSignalHandler();
+ }
InitializeLayerTwoSandbox(uses_nonsfi_mode);
base::GlobalDescriptors::GetInstance()->Set(
kPrimaryIPCChannel,

Powered by Google App Engine
This is Rietveld 408576698