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

ui/base/clipboard/clipboard_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.
 
 // Many of these functions are based on those found in
 // webkit/port/platform/PasteboardWin.cpp
 
 #include "ui/base/clipboard/clipboard.h"
 
 #include <shlobj.h>
@@ skipping 586 matching lines @@
 
   HDROP drop = static_cast<HDROP>(::GetClipboardData(CF_HDROP));
   if (!drop)
     return;
 
   // Count of files in the HDROP.
   int count = ::DragQueryFile(drop, 0xffffffff, NULL, 0);
 
   if (count) {
     for (int i = 0; i < count; ++i) {
-      int size = ::DragQueryFile(drop, i, NULL, 0) + 1;
+      UINT size = ::DragQueryFile(drop, i, NULL, 0) + 1;
+      DCHECK_GT(size, 1u);
       std::wstring file;
       ::DragQueryFile(drop, i, WriteInto(&file, size), size);
       files->push_back(FilePath(file));
     }
   }
 }
 
 void Clipboard::ReadData(const std::string& format, std::string* result) {
   if (!result) {
     NOTREACHED();
@@ skipping 119 matching lines @@
     clipboard_owner_ = ::CreateWindow(L"ClipboardOwnerWindowClass",
                                       L"ClipboardOwnerWindow",
                                       0, 0, 0, 0, 0,
                                       HWND_MESSAGE,
                                       0, 0, 0);
   }
   return clipboard_owner_;
 }
 
 }  // namespace ui