Skip unknown channel configurations when parsing session config.

remoting/protocol/content_description.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/content_description.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/authenticator.h"
@@ skipping 217 matching lines @@
     const XmlElement* const element,
     const char tag_name[],
     bool codec_required,
     bool optional,
     std::vector<ChannelConfig>* const configs) {
 
   QName tag(kChromotingXmlNamespace, tag_name);
   const XmlElement* child = element->FirstNamed(tag);
   while (child) {
     ChannelConfig channel_config;
-    if (!ParseChannelConfig(child, codec_required, &channel_config))
-      return false;
-    configs->push_back(channel_config);
+    if (ParseChannelConfig(child, codec_required, &channel_config)) {
+      configs->push_back(channel_config);
+    }
     child = child->NextNamed(tag);
   }
   if (optional && configs->empty()) {
       // If there's no mention of the tag, implicitly assume
       // TRANSPORT_NONE for the channel.
       configs->push_back(ChannelConfig(ChannelConfig::TRANSPORT_NONE,
                                        kDefaultStreamVersion,
                                        ChannelConfig::CODEC_VERBATIM));
   }
   return true;
 }
 
 // static
-ContentDescription* ContentDescription::ParseXml(
+scoped_ptr<ContentDescription> ContentDescription::ParseXml(
     const XmlElement* element) {
-  if (element->Name() == QName(kChromotingXmlNamespace, kDescriptionTag)) {
-    scoped_ptr<CandidateSessionConfig> config(
-        CandidateSessionConfig::CreateEmpty());
-    const XmlElement* child = NULL;
+  if (element->Name() != QName(kChromotingXmlNamespace, kDescriptionTag)) {
+    LOG(ERROR) << "Invalid description: " << element->Str();
+    return scoped_ptr<ContentDescription>();
+  }
+  scoped_ptr<CandidateSessionConfig> config(
+      CandidateSessionConfig::CreateEmpty());
+  if (!ParseChannelConfigs(element, kControlTag, false, false,
+                           config->mutable_control_configs()) ||
+      !ParseChannelConfigs(element, kEventTag, false, false,
+                           config->mutable_event_configs()) ||
+      !ParseChannelConfigs(element, kVideoTag, true, false,
+                           config->mutable_video_configs()) ||
+      !ParseChannelConfigs(element, kAudioTag, true, true,
+                           config->mutable_audio_configs())) {
+    return scoped_ptr<ContentDescription>();
+  }
 
-    if (!ParseChannelConfigs(element, kControlTag, false, false,
-                             config->mutable_control_configs())) {
-      return NULL;
-    }
-    if (!ParseChannelConfigs(element, kEventTag, false, false,
-                             config->mutable_event_configs())) {
-      return NULL;
-    }
-    if (!ParseChannelConfigs(element, kVideoTag, true, false,
-                             config->mutable_video_configs())) {
-      return NULL;
-    }
-    if (!ParseChannelConfigs(element, kAudioTag, true, true,
-                             config->mutable_audio_configs())) {
-      return NULL;
-    }
+  scoped_ptr<XmlElement> authenticator_message;
+  const XmlElement* child = Authenticator::FindAuthenticatorMessage(element);
+  if (child)
+    authenticator_message.reset(new XmlElement(*child));
 
-    scoped_ptr<XmlElement> authenticator_message;
-    child = Authenticator::FindAuthenticatorMessage(element);
-    if (child)
-      authenticator_message.reset(new XmlElement(*child));
-
-    return new ContentDescription(config.Pass(), authenticator_message.Pass());
-  }
-  LOG(ERROR) << "Invalid description: " << element->Str();
-  return NULL;
+  return scoped_ptr<ContentDescription>(
+      new ContentDescription(config.Pass(), authenticator_message.Pass()));
 }
 
 }  // namespace protocol
 }  // namespace remoting