From 38881be912168a0cdd4e5c45bf2ae667ffebe6b4 Mon Sep 17 00:00:00 2001 From: "braveyao@webrtc.org" Date: Wed, 17 Dec 2014 05:59:41 +0000 Subject: [PATCH] If one of the bundled content is missing in SDP, return false to MaybeEnalbeMuxingSupport(). Verified in chromium. Now the existing content still could work. BUG=4096 TEST=Manual Test R=juberti@webrtc.org Review URL: https://webrtc-codereview.appspot.com/36529004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7926 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/p2p/base/session.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webrtc/p2p/base/session.cc b/webrtc/p2p/base/session.cc index 9749b14ef7..30a9f2b0cf 100644 --- a/webrtc/p2p/base/session.cc +++ b/webrtc/p2p/base/session.cc @@ -730,7 +730,12 @@ bool BaseSession::MaybeEnableMuxingSupport() { const std::string* content_name = local_bundle_group->FirstContentName(); const ContentInfo* content = local_description_->GetContentByName(*content_name); - ASSERT(content != NULL); + if (!content) { + LOG(LS_WARNING) << "Content \"" << *content_name + << "\" referenced in BUNDLE group is not present"; + return false; + } + if (!SetSelectedProxy(content->name, local_bundle_group)) { LOG(LS_WARNING) << "Failed to set up BUNDLE"; return false;