summaryrefslogtreecommitdiffstats
path: root/remoting/protocol
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 22:53:46 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 22:53:46 +0000
commit2b644406bd6b66a0e7c05a64c181158704bb208a (patch)
treed3ad41d203f4522201a6e5b5e5a59a9acd10bc2c /remoting/protocol
parent1087a2768001290b917ba279420c390a415c90fe (diff)
downloadchromium_src-2b644406bd6b66a0e7c05a64c181158704bb208a.zip
chromium_src-2b644406bd6b66a0e7c05a64c181158704bb208a.tar.gz
chromium_src-2b644406bd6b66a0e7c05a64c181158704bb208a.tar.bz2
Fix handling of invalid certificates in JingleSessionManager.
BUG=None TEST=None Review URL: http://codereview.chromium.org/6649005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r--remoting/protocol/jingle_session_manager.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 88c1969..22ec733 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -444,7 +444,10 @@ bool JingleSessionManager::ParseContent(
std::string base64_cert = child->BodyText();
std::string der_cert;
bool ret = base::Base64Decode(base64_cert, &der_cert);
- DCHECK(ret) << "Failed to decode certificate";
+ if (!ret) {
+ LOG(ERROR) << "Failed to decode certificate received from the peer.";
+ return false;
+ }
certificate = net::X509Certificate::CreateFromBytes(der_cert.data(),
der_cert.length());
}