Make string_util::WriteInto() DCHECK() that the supplied |length_with_null| > 1, meaning that the...

ui/base/l10n/l10n_util.cc

 // Copyright (c) 2011 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 "ui/base/l10n/l10n_util.h"
 
 #if defined(USE_X11)
 #include <glib/gutils.h>
 #endif
 
@@ skipping 460 matching lines @@
   // 4. Patch ICU to special-case zh-Hans/zh-Hant for us.
   // #1 and #2 wouldn't work if display_locale != current UI locale although
   // we can think of additional hack to work around the problem.
   // #3 can be potentially expensive.
   if (locale_code == "zh-CN")
     locale_code = "zh-Hans";
   else if (locale_code == "zh-TW")
     locale_code = "zh-Hant";
 
   UErrorCode error = U_ZERO_ERROR;
-  const int buffer_size = 1024;
+  const int kBufferSize = 1024;
 
   string16 display_name;
   int actual_size = uloc_getDisplayName(locale_code.c_str(),
       display_locale.c_str(),
-      WriteInto(&display_name, buffer_size + 1), buffer_size, &error);
+      WriteInto(&display_name, kBufferSize), kBufferSize - 1, &error);
   DCHECK(U_SUCCESS(error));
   display_name.resize(actual_size);
   // Add an RTL mark so parentheses are properly placed.
   if (is_for_ui && base::i18n::IsRTL())
     display_name.push_back(static_cast<char16>(base::i18n::kRightToLeftMark));
   return display_name;
 }
 
 std::string NormalizeLocale(const std::string& locale) {
   std::string normalized_locale(locale);
@@ skipping 321 matching lines @@
   for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
     if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale))
       // TODO(jungshik) : Put them at the of the list with language codes
       // enclosed by brackets instead of skipping.
         continue;
     locale_codes->push_back(kAcceptLanguageList[i]);
   }
 }
 
 }  // namespace l10n_util