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

chrome/browser/shell_integration_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 "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 187 matching lines @@
 bool MigrateChromiumShortcutsTask::GetExpectedAppId(
     IShellLink* shell_link,
     std::wstring* expected_app_id) const {
   DCHECK(shell_link);
   DCHECK(expected_app_id);
 
   expected_app_id->clear();
 
   // Check if the shortcut points to chrome_exe.
   std::wstring source;
-  if (FAILED(shell_link->GetPath(WriteInto(&source, MAX_PATH),
-                                 MAX_PATH,
-                                 NULL,
+  if (FAILED(shell_link->GetPath(WriteInto(&source, MAX_PATH), MAX_PATH, NULL,
                                  SLGP_RAWPATH)) ||
       lstrcmpi(chrome_exe_.value().c_str(), source.c_str()))
     return false;
 
   std::wstring arguments;
   if (FAILED(shell_link->GetArguments(WriteInto(&arguments, MAX_PATH),
                                       MAX_PATH)))
     return false;
 
   // Get expected app id from shortcut command line.
@@ skipping 316 matching lines @@
   return icon_path;
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE, new MigrateChromiumShortcutsTask());
 }