diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 06:12:23 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 06:12:23 +0000 |
commit | 8900617c4da8fba5ebb646b0d840150bd7830b50 (patch) | |
tree | 81e7ebe71afe63c1bfe787d18cf2954debe7fcc4 /jingle | |
parent | 64bf047525cf98f49ab0ff0dd27c5c592df1bc56 (diff) | |
download | chromium_src-8900617c4da8fba5ebb646b0d840150bd7830b50.zip chromium_src-8900617c4da8fba5ebb646b0d840150bd7830b50.tar.gz chromium_src-8900617c4da8fba5ebb646b0d840150bd7830b50.tar.bz2 |
Fixed invalid reads when XmppClient is destroyed.
BUG=49274
TEST=manual testing with code to trigger bug repro
Review URL: http://codereview.chromium.org/3034016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53014 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r-- | jingle/notifier/listener/mediator_thread_impl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h index 6d4f997..519b2e8 100644 --- a/jingle/notifier/listener/mediator_thread_impl.h +++ b/jingle/notifier/listener/mediator_thread_impl.h @@ -81,9 +81,13 @@ class MediatorThreadImpl MessageLoop* worker_message_loop(); // Should only be called after OnConnectionStateChange() is called - // on the delegate with true. + // on the delegate with true and before it is called with false. buzz::XmppClient* xmpp_client(); + // This is virtual so that subclasses can also know when the + // connection state changes. + virtual void OnClientStateChangeMessage(LoginConnectionState state); + Delegate* delegate_; MessageLoop* parent_message_loop_; @@ -107,7 +111,6 @@ class MediatorThreadImpl const IncomingNotificationData& notification_data); void OnOutgoingNotification(bool success); void OnLoginFailureMessage(const notifier::LoginFailure& failure); - void OnClientStateChangeMessage(LoginConnectionState state); void OnSubscriptionStateChange(bool success); // Equivalents of the above functions called from the parent thread. |