[mojo-edk] Explicitly serialise HANDLEs into messages instead of PlatformHandles.

mojo/edk/system/node_channel.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/node_channel.h"
 
 #include <cstring>
 #include <limits>
 #include <sstream>
 
@@ skipping 398 matching lines @@
   {
     base::AutoLock lock(remote_process_handle_lock_);
     if (handles && remote_process_handle_ != base::kNullProcessHandle) {
       // Note that we explicitly mark the handles as being owned by the sending
       // process before rewriting them, in order to accommodate RewriteHandles'
       // internal sanity checks.
       for (auto& handle : *handles)
         handle.owning_process = remote_process_handle_;
       if (!Channel::Message::RewriteHandles(remote_process_handle_,
                                             base::GetCurrentProcessHandle(),
-                                            handles->data(), handles->size())) {
+                                            handles.get())) {
         DLOG(ERROR) << "Received one or more invalid handles.";
       }
     } else if (handles) {
       // Handles received by an unknown process must already be owned by us.
       for (auto& handle : *handles)
         handle.owning_process = base::GetCurrentProcessHandle();
     }
   }
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   // If we're not the root, receive any mach ports from the message. If we're
@@ skipping 291 matching lines @@
 
   if (message->has_handles()) {
     base::ProcessHandle remote_process_handle;
     {
       base::AutoLock lock(remote_process_handle_lock_);
       remote_process_handle = remote_process_handle_;
     }
 
     // Rewrite outgoing handles if we have a handle to the destination process.
     if (remote_process_handle != base::kNullProcessHandle) {
+      ScopedPlatformHandleVectorPtr handles = message->TakeHandles();
       if (!message->RewriteHandles(base::GetCurrentProcessHandle(),

[Ken Rockot(use gerrit already), 2016/05/25 15:48:12]

nit: While you're here please update this call site to be an obviously static
method call. Looks like this is a remnant of when it was non-static, and it's
confusing.

[Anand Mistry (off Chromium), 2016/05/25 23:36:38]

Done.

-                                   remote_process_handle, message->handles(),
-                                   message->num_handles())) {
+                                   remote_process_handle, handles.get())) {
         DLOG(ERROR) << "Failed to duplicate one or more outgoing handles.";
       }
+      message->SetHandles(std::move(handles));
     }
   }
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
   // On OSX, we need to transfer mach ports to the destination process before
   // transferring the message itself.
   if (message->has_mach_ports()) {
     MachPortRelay* relay = delegate_->GetMachPortRelay();
     if (relay) {
       base::ProcessHandle remote_process_handle;
       {
@@ skipping 26 matching lines @@
 
   base::AutoLock lock(channel_lock_);
   if (!channel_)
     DLOG(ERROR) << "Dropping message on closed channel.";
   else
     channel_->Write(std::move(message));
 }
 
 }  // namespace edk
 }  // namespace mojo