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

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

Issue 2555483002: Add POSIX shared memory support for Mac (Closed)
Patch Set: Check that we never pass POSIX shm over Mojo. Created 4 years 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_ipc_adapter.cc
diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc
index 3b1110251d1905d6fa2b9aa914dda0a3921d380c..9100ed6fbf99776fd5f1bc24695ce493ce82d993 100644
--- a/components/nacl/loader/nacl_ipc_adapter.cc
+++ b/components/nacl/loader/nacl_ipc_adapter.cc
@@ -234,9 +234,16 @@ std::unique_ptr<NaClDescWrapper> MakeShmNaClDesc(
const base::SharedMemoryHandle& handle,
size_t size) {
#if defined(OS_MACOSX)
- return std::unique_ptr<NaClDescWrapper>(new NaClDescWrapper(
- NaClDescImcShmMachMake(handle.GetMemoryObject(), size)));
-#else
+ if (handle.GetType() == base::SharedMemoryHandle::MACH) {
+ return std::unique_ptr<NaClDescWrapper>(new NaClDescWrapper(
+ NaClDescImcShmMachMake(handle.GetMemoryObject(), size)));
+ } else {
+ // We should never pass POSIX shared memory over IPC.
+ CHECK(false);
+ return nullptr;
+ }
+#endif
+
return std::unique_ptr<NaClDescWrapper>(
new NaClDescWrapper(NaClDescImcShmMake(
#if defined(OS_WIN)
@@ -245,7 +252,6 @@ std::unique_ptr<NaClDescWrapper> MakeShmNaClDesc(
base::SharedMemory::GetFdFromSharedMemoryHandle(handle),
#endif
size)));
-#endif
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698