Chromium Code Reviews| Index: chrome/nacl/nacl_listener.cc |
| diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc |
| index b0b27e91a461904f9d9eef84f9cba4eb338d4e08..57cf322273927023c7791a65d2755141af7e5be1 100644 |
| --- a/chrome/nacl/nacl_listener.cc |
| +++ b/chrome/nacl/nacl_listener.cc |
| @@ -21,6 +21,7 @@ |
| #include "ipc/ipc_sync_channel.h" |
| #include "ipc/ipc_sync_message_filter.h" |
| #include "native_client/src/trusted/service_runtime/sel_main_chrome.h" |
| +#include "native_client/src/trusted/validator/nacl_file_info.h" |
| #if defined(OS_POSIX) |
| #include "base/file_descriptor_posix.h" |
| @@ -130,6 +131,38 @@ class BrowserValidationDBProxy : public NaClValidationDB { |
| } |
| } |
| + virtual bool ResolveFileToken(struct NaClFileToken *file_token, |
|
Mark Seaborn
2013/05/24 20:21:58
Fix "*" spacing style
Nick Bray (chromium)
2013/05/24 21:35:24
Done.
|
| + int32* fd, std::string* path) OVERRIDE { |
| + *fd = -1; |
| + *path = ""; |
| + if (file_token->lo == 0 && file_token->hi == 0) { |
| + return false; |
| + } |
| + IPC::PlatformFileForTransit ipc_fd; |
| + base::FilePath ipc_path; |
| + if (!listener_->Send(new NaClProcessMsg_ResolveFileToken(file_token->lo, |
| + file_token->hi, |
| + &ipc_fd, |
| + &ipc_path))) { |
| + return false; |
| + } |
| + if (ipc_fd == IPC::InvalidPlatformFileForTransit()) { |
| + return false; |
| + } |
| + base::PlatformFile handle = |
| + IPC::PlatformFileForTransitToPlatformFile(ipc_fd); |
| +#if defined(OS_WIN) |
| + // On Windows, valid handles are 32 bit unsigned integers so this is safe. |
| + *fd = reinterpret_cast<uintptr_t>(handle); |
| +#else |
| + *fd = handle; |
| +#endif |
| + // It doesn't matter if the path is valid UTF8 as long as it's repeatable |
|
Mark Seaborn
2013/05/24 20:21:58
Do you mean "It doesn't matter if the path is inva
Nick Bray (chromium)
2013/05/24 21:35:24
Done.
|
| + // and unforgeable. |
| + *path = ipc_path.AsUTF8Unsafe(); |
| + return true; |
| + } |
| + |
| private: |
| // The listener never dies, otherwise this might be a dangling reference. |
| NaClListener* listener_; |