Fix a ChromeFrame crash which occurs in the field typically during upgrades w...

chrome_frame/dll_redirector.cc

 // Copyright (c) 2010 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_frame/dll_redirector.h"
 
 #include <aclapi.h>
 #include <atlbase.h>
 #include <atlsecurity.h>
 #include <sddl.h>
@@ skipping 11 matching lines @@
 
 const wchar_t kSharedMemoryName[] = L"ChromeFrameVersionBeacon_";
 const uint32 kSharedMemorySize = 128;
 const uint32 kSharedMemoryLockTimeoutMs = 1000;
 
 // static
 DllRedirector::DllRedirector() : first_module_handle_(NULL) {
   // TODO(robertshield): Allow for overrides to be taken from the environment.
   std::wstring beacon_name(kSharedMemoryName);
   beacon_name += GetHostProcessName(false);
-  shared_memory_.reset(new base::SharedMemory(beacon_name));
+  shared_memory_.reset(new base::SharedMemory());
+  shared_memory_name_ = WideToUTF8(beacon_name);
 }
 
 DllRedirector::DllRedirector(const char* shared_memory_name)
     : shared_memory_name_(shared_memory_name), first_module_handle_(NULL) {
   shared_memory_.reset(new base::SharedMemory(ASCIIToWide(shared_memory_name)));
 }
 
 DllRedirector::~DllRedirector() {
   if (first_module_handle_) {
     if (first_module_handle_ != reinterpret_cast<HMODULE>(&__ImageBase)) {
@@ skipping 239 matching lines @@
                            .Append(module_name);
 
   HMODULE hmodule = LoadLibrary(module_path.value().c_str());
   if (hmodule == NULL) {
     DPLOG(ERROR) << "Could not load reported module version "
                  << version->GetString();
   }
 
   return hmodule;
 }