Postpone deletion of P2PTransportImpl internals when it is being deleted.

PPB_Transport may be deleted from any of its callbacks, but P2PTransportImpl
was crashing when it is deleted from one of the socked callbacks.
This is because libjingle's sigslot cannot be deleted from signal
handlers. With this change deletion of libjingle objects that may
contain sigslots is postponed until all signals handlers are finished.

BUG=109661


Review URL: http://codereview.chromium.org/9158028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117147 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 2 deletions

diff --git a/content/renderer/p2p/p2p_transport_impl.cc b/content/renderer/p2p/p2p_transport_impl.cc
index b61d616..550947c 100644
--- a/content/renderer/p2p/p2p_transport_impl.cc
+++ b/content/renderer/p2p/p2p_transport_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -37,6 +37,14 @@ P2PTransportImpl::P2PTransportImpl(P2PSocketDispatcher* socket_dispatcher)
 }
 
 P2PTransportImpl::~P2PTransportImpl() {
+  MessageLoop* message_loop = MessageLoop::current();
+
+  // Because libjingle's sigslot doesn't handle deletion from a signal
+  // handler we have to postpone deletion of libjingle objects.
+  message_loop->DeleteSoon(FROM_HERE, channel_.release());
+  message_loop->DeleteSoon(FROM_HERE, allocator_.release());
+  message_loop->DeleteSoon(FROM_HERE, socket_factory_.release());
+  message_loop->DeleteSoon(FROM_HERE, network_manager_.release());
 }
 
 bool P2PTransportImpl::Init(WebKit::WebFrame* web_frame,
@@ -74,7 +82,7 @@ bool P2PTransportImpl::Init(WebKit::WebFrame* web_frame,
       this, &P2PTransportImpl::OnCandidateReady);
 
   if (protocol == PROTOCOL_UDP) {
-    channel_->SignalWritableState.connect(
+    channel_->SignalReadableState.connect(
         this, &P2PTransportImpl::OnReadableState);
     channel_->SignalWritableState.connect(
         this, &P2PTransportImpl::OnWriteableState);