From 7c23cfc44c6fa5d224acd7cae942dc7310138c7b Mon Sep 17 00:00:00 2001 From: "piman@chromium.org" Date: Tue, 18 Aug 2009 22:26:06 +0000 Subject: linux/mac: fix another race condition with the plugin channel http://codereview.chromium.org/165280 helped a lot, but it turns out that the ResourceClientProxy keep a reference to the channel, and it's hard to clean those in time. To be on the safe side, remove the name->FD mapping when the channel is removed from the name->channel map. Also remove it when a channel error occurs. Again, to be on the safe side, the channel is unusable at this point (the other side may have closed it already), so it's better to drop it. BUG=18521 Review URL: http://codereview.chromium.org/171100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23666 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/plugin/plugin_channel.cc | 1 - chrome/plugin/plugin_channel_base.cc | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'chrome/plugin') diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc index 7234e16..04d9afc 100644 --- a/chrome/plugin/plugin_channel.cc +++ b/chrome/plugin/plugin_channel.cc @@ -58,7 +58,6 @@ PluginChannel::~PluginChannel() { if (renderer_handle_) base::CloseProcessHandle(renderer_handle_); #if defined(OS_POSIX) - IPC::RemoveAndCloseChannelSocket(channel_name()); // If we still have the renderer FD, close it. if (renderer_fd_ != -1) { close(renderer_fd_); diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc index 4ef42ae..73a32e6 100644 --- a/chrome/plugin/plugin_channel_base.cc +++ b/chrome/plugin/plugin_channel_base.cc @@ -8,6 +8,10 @@ #include "chrome/common/child_process.h" #include "ipc/ipc_sync_message.h" +#if defined(OS_POSIX) +#include "ipc/ipc_channel_posix.h" +#endif + typedef base::hash_map > PluginChannelMap; @@ -167,6 +171,11 @@ void PluginChannelBase::RemoveRoute(int route_id) { PluginChannelMap::iterator iter = g_plugin_channels_.begin(); while (iter != g_plugin_channels_.end()) { if (iter->second == this) { +#if defined(OS_POSIX) + if (channel_valid()) { + IPC::RemoveAndCloseChannelSocket(channel_name()); + } +#endif g_plugin_channels_.erase(iter); return; } @@ -184,6 +193,11 @@ void PluginChannelBase::OnControlMessageReceived(const IPC::Message& msg) { } void PluginChannelBase::OnChannelError() { +#if defined(OS_POSIX) + if (channel_valid()) { + IPC::RemoveAndCloseChannelSocket(channel_name()); + } +#endif channel_valid_ = false; } -- cgit v1.1