diff options
author | hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 05:37:59 +0000 |
---|---|---|
committer | hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 05:37:59 +0000 |
commit | 2aa3fb137d5d16e3b6c569288ca4fcfe28945461 (patch) | |
tree | 409555b4a6c5cba6a84350ad8b508f021333506b /ipc/ipc_channel_posix.cc | |
parent | 44929ee98e13e54e50b6f5876cd4cec8a779e44a (diff) | |
download | chromium_src-2aa3fb137d5d16e3b6c569288ca4fcfe28945461.zip chromium_src-2aa3fb137d5d16e3b6c569288ca4fcfe28945461.tar.gz chromium_src-2aa3fb137d5d16e3b6c569288ca4fcfe28945461.tar.bz2 |
Fix posix IPC channel hanging problem.
If a channel closes right before a send call, listeners might not be notified of
the problem, which can cause hangs. This CL fixes that and adds a test that makes
sure that this does not happen in the future.
This is cl/30133002 + a memory leak fix.
BUG=338709
Review URL: https://codereview.chromium.org/150893002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_posix.cc')
-rw-r--r-- | ipc/ipc_channel_posix.cc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 8788532..09b72d5 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -31,6 +31,7 @@ #include "base/posix/global_descriptors.h" #include "base/process/process_handle.h" #include "base/rand_util.h" +#include "base/run_loop.h" #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/synchronization/lock.h" @@ -327,7 +328,7 @@ bool Channel::ChannelImpl::CreatePipe( bool Channel::ChannelImpl::Connect() { if (server_listen_pipe_ == -1 && pipe_ == -1) { - DLOG(INFO) << "Channel creation failed: " << pipe_name_; + DLOG(WARNING) << "Channel creation failed: " << pipe_name_; return false; } @@ -519,10 +520,18 @@ bool Channel::ChannelImpl::Send(Message* message) { Logging::GetInstance()->OnSendMessage(message, ""); #endif // IPC_MESSAGE_LOG_ENABLED + if (!waiting_connect_ && pipe_ == -1) { + delete message; + return false; + } + message->TraceMessageBegin(); output_queue_.push(message); if (!is_blocked_on_write_ && !waiting_connect_) { - return ProcessOutgoingMessages(); + if (!ProcessOutgoingMessages()) { + ClosePipeOnError(); + return false; + } } return true; @@ -707,7 +716,11 @@ bool Channel::ChannelImpl::AcceptConnection() { // In server mode we will send a hello message when we receive one from a // client. waiting_connect_ = false; - return ProcessOutgoingMessages(); + if (!ProcessOutgoingMessages()) { + ClosePipeOnError(); + return false; + } + return true; } else if (mode_ & MODE_SERVER_FLAG) { waiting_connect_ = true; return true; |