diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 23:51:37 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 23:51:37 +0000 |
| commit | f1acf0627a4d0c85d08a5f2e90dfb8173f7e038c (patch) | |
| tree | 4fcb5a763c074447afe7b05219f11ec8efa46fc9 /remoting/jingle_glue | |
| parent | 68c63a24378be705c69720297baa45589de4a856 (diff) | |
| download | chromium_src-f1acf0627a4d0c85d08a5f2e90dfb8173f7e038c.zip chromium_src-f1acf0627a4d0c85d08a5f2e90dfb8173f7e038c.tar.gz chromium_src-f1acf0627a4d0c85d08a5f2e90dfb8173f7e038c.tar.bz2 | |
Fix crash in XmppSignalStrategy.
BUG=None
TEST=Remoting host doesn't crash
Review URL: http://codereview.chromium.org/7236020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/javascript_signal_strategy.cc | 3 | ||||
| -rw-r--r-- | remoting/jingle_glue/xmpp_signal_strategy.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/remoting/jingle_glue/javascript_signal_strategy.cc b/remoting/jingle_glue/javascript_signal_strategy.cc index 6227b5e..a754bb0 100644 --- a/remoting/jingle_glue/javascript_signal_strategy.cc +++ b/remoting/jingle_glue/javascript_signal_strategy.cc @@ -91,7 +91,8 @@ void JavascriptSignalStrategy::OnIq(const std::string& stanza_str) { return; } - listener_->OnIncomingStanza(stanza.get()); + if (listener_) + listener_->OnIncomingStanza(stanza.get()); iq_registry_.OnIncomingStanza(stanza.get()); } diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/jingle_glue/xmpp_signal_strategy.cc index a8a8008..28f5e59 100644 --- a/remoting/jingle_glue/xmpp_signal_strategy.cc +++ b/remoting/jingle_glue/xmpp_signal_strategy.cc @@ -94,7 +94,8 @@ IqRequest* XmppSignalStrategy::CreateIqRequest() { } bool XmppSignalStrategy::HandleStanza(const buzz::XmlElement* stanza) { - listener_->OnIncomingStanza(stanza); + if (listener_) + listener_->OnIncomingStanza(stanza); return false; } |