Catching more errors when parsing ICE server URLs.

webrtc/base/stringencode.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 555 matching lines @@
       }
       last = i + 1;
     }
   }
   if (last != source.length()) {
     fields->push_back(source.substr(last, source.length() - last));
   }
   return fields->size();
 }
 
+size_t tokenize_with_empty_tokens(const std::string& source,
+                                  char delimiter,
+                                  std::vector<std::string>* fields) {
+  DCHECK(fields);

[tommi, 2015/09/16 21:51:01]

since fields is deferenced anyway, this isn't needed (and discouraged actually)

[Taylor Brandstetter, 2015/09/24 00:25:05]

Done.

+  fields->clear();

[tommi, 2015/09/16 21:51:01]

I'd prefer DCHECK(fields->empty()) instead.  |fields| will in practice always be
empty, so this is bloat, if there ever is a case where it's needed, the caller
can clear() before calling if appending is really not what's desired.

[Taylor Brandstetter, 2015/09/24 00:25:05]

There's a function specifically called "tokenize_append", so I think the
assumption is that "tokenize" (and by extension, tokenize_with_empty_tokens)
will overwrite the list. Also, if there's code that's doing a lot of tokenizing,
it would be convenient to just use one vector<string>, and not need to clear()
it every time.

+  size_t last = 0;
+  for (size_t i = 0; i < source.length(); ++i) {
+    if (source[i] == delimiter) {
+      fields->push_back(source.substr(last, i - last));
+      last = i + 1;
+    }
+  }
+  fields->push_back(source.substr(last, source.length() - last));
+  return fields->size();

[tommi, 2015/09/16 21:51:01]

if source is empty, won't fields->size() return 1? (I would expect the return
value to be 0 in that case)

[Taylor Brandstetter, 2015/09/24 00:25:05]

This is actually the behavior I wanted, in this situation.

+}
+
 size_t tokenize_append(const std::string& source, char delimiter,
                        std::vector<std::string>* fields) {
   if (!fields) return 0;
 
   std::vector<std::string> new_fields;
   tokenize(source, delimiter, &new_fields);
   fields->insert(fields->end(), new_fields.begin(), new_fields.end());
   return fields->size();
 }
 
@@ skipping 88 matching lines @@
   va_list args;
   va_start(args, format);
   value.assign(buffer, vsprintfn(buffer, maxlen + 1, format, args));
   va_end(args);
 }
 */
 
 /////////////////////////////////////////////////////////////////////////////
 
 }  // namespace rtc