Index: mojo/edk/system/message_pipe_dispatcher.cc |
diff --git a/mojo/edk/system/message_pipe_dispatcher.cc b/mojo/edk/system/message_pipe_dispatcher.cc |
index e3bc13b581b24ffba506af2abf4fdfb38c538948..f4bd93b91d5a740f1b1d76736b98f6b09c5d6044 100644 |
--- a/mojo/edk/system/message_pipe_dispatcher.cc |
+++ b/mojo/edk/system/message_pipe_dispatcher.cc |
@@ -118,6 +118,8 @@ void MessagePipeDispatcher::Init( |
InitOnIO(); |
} |
// TODO(jam): optimize for when running on IO thread? |
+ } else { |
+ error_ = true; |
} |
} |
@@ -636,6 +638,8 @@ bool MessagePipeDispatcher::EndSerializeAndCloseImplNoLock( |
serialization->shared_memory_handle_index = platform_handles->size(); |
platform_handles->push_back(shared_buffer->PassPlatformHandle().release()); |
+ } else { |
+ serialization->shared_memory_handle_index = kInvalidMessagePipeHandleIndex; |
} |
*actual_size = sizeof(SerializedMessagePipeHandleDispatcher); |