Handle spaces in the name of the mini_installer.

chrome/installer/mini_installer/mini_installer.cc

 // Copyright (c) 2012 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.
 
 // mini_installer.exe is the first exe that is run when chrome is being
 // installed or upgraded. It is designed to be extremely small (~5KB with no
 // extra resources linked) and it has two main jobs:
 //   1) unpack the resources (possibly decompressing some)
 //   2) run the real installer (setup.exe) with appropriate flags.
 //
@@ skipping 231 matching lines @@
       NULL, full_exe_path.get(), static_cast<DWORD>(full_exe_path.capacity()));
   if (!len || len >= full_exe_path.capacity())
     return;
 
   const wchar_t* exe_name =
       GetNameFromPathExt(full_exe_path.get(), static_cast<DWORD>(len));
 
   // - configuration.program() returns the first command line argument
   //   passed into the program (that the user probably typed in this case).
   //       "mini_installer.exe"
+  //       "mini_installer (1).exe"
   //       "mini_installer"
   //       "out\Release\mini_installer"
   // - |exe_name| is the executable file of the current process.
   //       "mini_installer.exe"
   //
   // Note that there are three possibilities to handle here.
   // Receive a cmdline containing:
-  // 1) executable name WITH extension
+  // 1) executable name WITH extension (possibly containing a space)
   // 2) executable name with NO extension
   // 3) NO executable name as part of cmdline
   const wchar_t* cmd_to_append = L"";
   const wchar_t* arg0 = configuration.program();
   if (!arg0)
     return;
   const wchar_t* arg0_base_name = GetNameFromPathExt(arg0, ::lstrlen(arg0));
   if (!StrStartsWith(exe_name, arg0_base_name)) {
     // State 3: NO executable name as part of cmdline.
     buffer->append(L" ");
     cmd_to_append = configuration.command_line();
   } else if (configuration.argument_count() > 1) {
     // State 1 or 2: Executable name is in cmdline.
     // - Append everything AFTER the executable name.
     //   (Using arg0_base_name here to make sure to match with or without
     //   extension.  Then move to the space following the token.)
     const wchar_t* tmp = SearchStringI(configuration.command_line(),
                                        arg0_base_name);
-    tmp = SearchStringI(tmp, L" ");
+    tmp = SearchStringI(tmp + ::lstrlen(arg0_base_name), L" ");

[bcwhite, 2017/01/26 15:36:22]

If you know the length of the program name, why do you need to search for the
next space character?

No tests for this?

[grt (UTC plus 2), 2017/01/26 16:07:47]

I think it's possible that there could be a trailing double-quote.
None so far. Now is as good a time as any to add some. I'll send up another
patch set with some.

     cmd_to_append = tmp;
   }
 
   buffer->append(cmd_to_append);
 }
 
 
 // Windows defined callback used in the EnumResourceNames call. For each
 // matching resource found, the callback is invoked and at this point we write
 // it to disk. We expect resource names to start with 'chrome' or 'setup'. Any
@@ skipping 632 matching lines @@
 #pragma function(memset)
 void* memset(void* dest, int c, size_t count) {
   void* start = dest;
   while (count--) {
     *reinterpret_cast<char*>(dest) = static_cast<char>(c);
     dest = reinterpret_cast<char*>(dest) + 1;
   }
   return start;
 }
 }  // extern "C"