summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 11:19:26 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 11:19:26 +0000
commit51a7abe126419595a030e29dfab899454a813911 (patch)
tree6613ad59bd1974517a40f2c5cc50ff9c282d73cc /chrome/browser
parent7d947dab6a4fe9bc7b4022f6a87eaaeccf069ebd (diff)
downloadchromium_src-51a7abe126419595a030e29dfab899454a813911.zip
chromium_src-51a7abe126419595a030e29dfab899454a813911.tar.gz
chromium_src-51a7abe126419595a030e29dfab899454a813911.tar.bz2
DevTools: a better fix for socket closure crash.
Review URL: http://codereview.chromium.org/5986001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/debugger/devtools_http_protocol_handler.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc
index 9f23945..1aaf18b 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.cc
+++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc
@@ -263,13 +263,13 @@ void DevToolsHttpProtocolHandler::OnWebSocketMessageUI(
void DevToolsHttpProtocolHandler::OnCloseUI(HttpListenSocket* socket) {
SocketToClientHostMap::iterator it = socket_to_client_host_ui_.find(socket);
- if (it == socket_to_client_host_ui_.end())
- return;
- DevToolsClientHostImpl* client_host =
- static_cast<DevToolsClientHostImpl*>(it->second);
- client_host->NotifyCloseListener();
- delete client_host;
- socket_to_client_host_ui_.erase(socket);
+ if (it != socket_to_client_host_ui_.end()) {
+ DevToolsClientHostImpl* client_host =
+ static_cast<DevToolsClientHostImpl*>(it->second);
+ client_host->NotifyCloseListener();
+ delete client_host;
+ socket_to_client_host_ui_.erase(socket);
+ }
// We are holding last reference to scoped refptr 'socket' here.
// We can't exit method just like that since 'socket' is going to