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);
-    child = child->NextNamed(tag);
+    if (ParseChannelConfig(child, codec_required, &channel_config)) {
+      configs->push_back(channel_config);
+      child = child->NextNamed(tag);

[simonmorris, 2012/07/26 16:11:06]

The loop will go infinite if ParseChannelConfig ever returns false.

A unit test would have caught this error.

[Sergey Ulanov, 2012/07/26 22:54:45]

Fixed.
And added unittest this time.

+    }
   }
   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;
 }
@@ skipping 29 matching lines @@
       authenticator_message.reset(new XmlElement(*child));
 
     return new ContentDescription(config.Pass(), authenticator_message.Pass());
   }
   LOG(ERROR) << "Invalid description: " << element->Str();
   return NULL;
 }
 
 }  // namespace protocol
 }  // namespace remoting