| Index: chrome/installer/mini_installer/decompress.cc
|
| diff --git a/chrome/installer/mini_installer/decompress.cc b/chrome/installer/mini_installer/decompress.cc
|
| index ed9098a85211d735ed004ba4f6f02e48e55b1d0e..eaec28d6bf61cf23b773b590c2a380b794a524fc 100644
|
| --- a/chrome/installer/mini_installer/decompress.cc
|
| +++ b/chrome/installer/mini_installer/decompress.cc
|
| @@ -190,13 +190,14 @@ bool InitializeFdi() {
|
| L"C:\\Windows\\system32\\cabinet.dll",
|
| };
|
|
|
| - wchar_t path[MAX_PATH] = {0};
|
| - for (int i = 0; i < arraysize(candidate_paths); ++i) {
|
| + static const DWORD kBufferSize = MAX_PATH;
|
| + wchar_t path[kBufferSize];
|
| + for (const wchar_t* candidate_path : candidate_paths) {
|
| path[0] = L'\0';
|
| - DWORD result = ::ExpandEnvironmentStringsW(candidate_paths[i],
|
| - path, arraysize(path));
|
| + DWORD result = ::ExpandEnvironmentStringsW(candidate_path,
|
| + path, kBufferSize);
|
|
|
| - if (result > 0 && result <= arraysize(path))
|
| + if (result > 0 && result <= kBufferSize)
|
| g_fdi = ::LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
|
|
|
| if (g_fdi)
|
|
|