Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8

mojo/edk/system/raw_channel.cc

 // Copyright 2014 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/raw_channel.h"
 
 #include <string.h>
 
 #include <algorithm>
 
@@ skipping 58 matching lines @@
 
   return true;
 }
 
 void RawChannel::WriteBuffer::GetPlatformHandlesToSend(
     size_t* num_platform_handles,
     embedder::PlatformHandle** platform_handles,
     void** serialization_data) {
   DCHECK(HavePlatformHandlesToSend());
 
-  TransportData* transport_data = message_queue_.front()->transport_data();
+  MessageInTransit* message = message_queue_.front();
+  TransportData* transport_data = message->transport_data();
   embedder::PlatformHandleVector* all_platform_handles =
       transport_data->platform_handles();
   *num_platform_handles =
       all_platform_handles->size() - platform_handles_offset_;
   *platform_handles = &(*all_platform_handles)[platform_handles_offset_];
-  size_t serialization_data_offset =
-      transport_data->platform_handle_table_offset();
-  DCHECK_GT(serialization_data_offset, 0u);
-  serialization_data_offset +=
-      platform_handles_offset_ * serialized_platform_handle_size_;
-  *serialization_data =
-      static_cast<char*>(transport_data->buffer()) + serialization_data_offset;
+
+  if (serialized_platform_handle_size_ > 0) {
+    size_t serialization_data_offset =
+        transport_data->platform_handle_table_offset();
+    DCHECK_GT(serialization_data_offset, 0u);
+    serialization_data_offset +=
+        platform_handles_offset_ * serialized_platform_handle_size_;
+    *serialization_data = static_cast<char*>(transport_data->buffer()) +
+                          serialization_data_offset;
+  } else {
+    *serialization_data = nullptr;
+  }
 }
 
 void RawChannel::WriteBuffer::GetBuffers(std::vector<Buffer>* buffers) const {
   buffers->clear();
 
   if (message_queue_.empty())
     return;
 
   MessageInTransit* message = message_queue_.front();
   DCHECK_LT(data_offset_, message->total_size());
@@ skipping 405 matching lines @@
 
   write_stopped_ = true;
   STLDeleteElements(&write_buffer_->message_queue_);
   write_buffer_->platform_handles_offset_ = 0;
   write_buffer_->data_offset_ = 0;
   return false;
 }
 
 }  // namespace system
 }  // namespace mojo