Make SplitString() and variants clear their outparam vector. (Note that SplitStringIntoKeyValues()…

base/string_split.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 "base/string_split.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {
 
 template<typename STR>
 static void SplitStringT(const STR& str,
                          const typename STR::value_type s,
                          bool trim_whitespace,
                          std::vector<STR>* r) {
+  r->clear();
   size_t last = 0;
   size_t c = str.size();
   for (size_t i = 0; i <= c; ++i) {
     if (i == c || str[i] == s) {
       STR tmp(str, last, i - last);
       if (trim_whitespace)
         TrimWhitespace(tmp, TRIM_ALL, &tmp);
       // Avoid converting an empty or all-whitespace source string into a vector
       // of one empty string.
       if (i != c || !r->empty() || !tmp.empty())
@@ skipping 79 matching lines @@
     DCHECK_LE(value.size(), 1U);
     kv_pairs->push_back(make_pair(key, value.empty()? "" : value[0]));
   }
   return success;
 }
 
 template <typename STR>
 static void SplitStringUsingSubstrT(const STR& str,
                                     const STR& s,
                                     std::vector<STR>* r) {
+  r->clear();
   typename STR::size_type begin_index = 0;
   while (true) {
     const typename STR::size_type end_index = str.find(s, begin_index);
     if (end_index == STR::npos) {
       const STR term = str.substr(begin_index);
       STR tmp;
       TrimWhitespace(term, TRIM_ALL, &tmp);
       r->push_back(tmp);
       return;
     }
@@ skipping 30 matching lines @@
   DCHECK(IsStringUTF8(str));
 #if CHAR_MIN < 0
   DCHECK(c >= 0);
 #endif
   DCHECK(c < 0x7F);
   SplitStringT(str, c, false, r);
 }
 
 template<typename STR>
 void SplitStringAlongWhitespaceT(const STR& str, std::vector<STR>* result) {
+  result->clear();
   const size_t length = str.length();
   if (!length)
     return;
 
   bool last_was_ws = false;
   size_t last_non_ws_start = 0;
   for (size_t i = 0; i < length; ++i) {
     switch (str[i]) {
       // HTML 5 defines whitespace as: space, tab, LF, line tab, FF, or CR.
       case L' ':
@@ skipping 29 matching lines @@
                                 std::vector<string16>* result) {
   SplitStringAlongWhitespaceT(str, result);
 }
 
 void SplitStringAlongWhitespace(const std::string& str,
                                 std::vector<std::string>* result) {
   SplitStringAlongWhitespaceT(str, result);
 }
 
 }  // namespace base