Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(539)

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 13594011: Fix chromoting client crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 1514466c803f59e613883b6326b878a25f4daacf..f5d9bd1dff043105f0cc1c58c162ff5e6b5c676e 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -616,7 +616,10 @@ void ChromotingInstance::Disconnect() {
}
void ChromotingInstance::OnIncomingIq(const std::string& iq) {
- xmpp_proxy_->OnIq(iq);
+ // Just ignore the message if it's received before Connect() is called. It's
+ // likely to be a leftover from a previous session, so it's safe to ignore it.
+ if (xmpp_proxy_)
+ xmpp_proxy_->OnIq(iq);
}
void ChromotingInstance::ReleaseAllKeys() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698