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

views/controls/textfield/native_textfield_win.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 "views/controls/textfield/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
@@ skipping 155 matching lines @@
   // See the code in textfield.cc that calls this for why this is here.
   container_view_->set_focus_view(textfield_);
   container_view_->Attach(m_hWnd);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWin, NativeTextfieldWrapper implementation:
 
 string16 NativeTextfieldWin::GetText() const {
   int len = GetTextLength() + 1;
-  if (len <= 1)
-    return string16();
-
   string16 str;
-  GetWindowText(WriteInto(&str, len), len);
+  if (len > 1)
+    GetWindowText(WriteInto(&str, len), len);
   // The text get from GetWindowText() might be wrapped with explicit bidi
   // control characters. Refer to UpdateText() for detail. Without such
   // wrapping, in RTL chrome, a pure LTR string ending with parenthesis will
   // not be displayed correctly in a textfield. For example, "Yahoo!" will be
   // displayed as "!Yahoo", and "Google (by default)" will be displayed as
   // "(Google (by default".
-  return base::i18n::StripWrappingBidiControlCharacters(WideToUTF16(str));
+  return base::i18n::StripWrappingBidiControlCharacters(str);
 }
 
 void NativeTextfieldWin::UpdateText() {
   string16 text = textfield_->text();
   // Adjusting the string direction before setting the text in order to make
   // sure both RTL and LTR strings are displayed properly.
   base::i18n::AdjustStringForLocaleDirection(&text);
   if (textfield_->style() & Textfield::STYLE_LOWERCASE)
     text = base::i18n::ToLower(text);
   SetWindowText(text.c_str());
   UpdateAccessibleValue(text);
 }
 
 void NativeTextfieldWin::AppendText(const string16& text) {
   int text_length = GetWindowTextLength();
   ::SendMessage(m_hWnd, TBM_SETSEL, true, MAKELPARAM(text_length, text_length));
   ::SendMessage(m_hWnd, EM_REPLACESEL, false,
                 reinterpret_cast<LPARAM>(text.c_str()));
 }
 
 string16 NativeTextfieldWin::GetSelectedText() const {
-  // Figure out the length of the selection.
   CHARRANGE sel;
   GetSel(sel);
-  if (sel.cpMin == sel.cpMax)  // GetSelText() crashes on NULL input.
-    return string16();
-
-  // Grab the selected text.
   string16 str;
-  GetSelText(WriteInto(&str, sel.cpMax - sel.cpMin + 1));
+  if (sel.cpMin != sel.cpMax)
+    GetSelText(WriteInto(&str, sel.cpMax - sel.cpMin + 1));
   return str;
 }
 
 void NativeTextfieldWin::SelectAll() {
   // Select from the end to the front so that the first part of the text is
   // always visible.
   SetSel(GetTextLength(), 0);
 }
 
 void NativeTextfieldWin::ClearSelection() {
@@ skipping 931 matching lines @@
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   if (views::Widget::IsPureViews())
     return new NativeTextfieldViews(field);
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views