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

ui/base/win/ime_input.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/win/ime_input.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
@@ skipping 321 matching lines @@
     }
     if (target_end < length) {
       underline.start_offset = target_end;
       underline.end_offset = length;
       underline.thick = false;
       composition->underlines.push_back(underline);
     }
   }
 }
 
-bool ImeInput::GetString(HIMC imm_context, WPARAM lparam, int type,
+bool ImeInput::GetString(HIMC imm_context,
+                         WPARAM lparam,
+                         int type,
                          string16* result) {
-  bool ret = false;
-  if (lparam & type) {
-    int string_size = ::ImmGetCompositionString(imm_context, type, NULL, 0);
-    if (string_size > 0) {
-      int string_length = string_size / sizeof(wchar_t);
-      wchar_t *string_data = WriteInto(result, string_length + 1);
-      if (string_data) {
-        // Fill the given result object.
-        ::ImmGetCompositionString(imm_context, type, string_data, string_size);
-        ret = true;
-      }
-    }
-  }
-  return ret;
+  if (!lparam || !type)

[cbentzel, 2011/11/01 12:15:07]

This isn't the same logic as before - intentional?

[Peter Kasting, 2011/11/01 19:43:28]

Nice catch!  I misread "&" as "&&".

+    return false;
+  LONG string_size = ::ImmGetCompositionString(imm_context, type, NULL, 0);
+  if (string_size <= 0)
+    return false;
+  DCHECK_EQ(0u, string_size % sizeof(wchar_t));
+  ::ImmGetCompositionString(imm_context, type,
+      WriteInto(result, (string_size / sizeof(wchar_t)) + 1), string_size);
+  return true;
 }
 
 bool ImeInput::GetResult(HWND window_handle, LPARAM lparam, string16* result) {
   bool ret = false;
   HIMC imm_context = ::ImmGetContext(window_handle);
   if (imm_context) {
     ret = GetString(imm_context, lparam, GCS_RESULTSTR, result);
     ::ImmReleaseContext(window_handle, imm_context);
   }
   return ret;
@@ skipping 184 matching lines @@
   keystate[VK_RCONTROL] = 0;
   keystate[VK_LCONTROL] = 0;
   for (int i = 0; i <= VK_PACKET; ++i) {
     if (keystate[i] & kKeyDownMask)
       return false;
   }
   return true;
 }
 
 }  // namespace ui