Switch out use of std::string and std::vector for large allocations for a buffer class that doesn...

chrome/installer/setup/setup_util.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.
 //
 // This file declares util functions for setup project.
 
 #include "chrome/installer/setup/setup_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 
   // Try Courgette first.  Courgette checks the patch file first and fails
   // quickly if the patch file does not have a valid Courgette header.
   courgette::Status patch_status =
       courgette::ApplyEnsemblePatch(src.value().c_str(),
                                     patch.value().c_str(),
                                     dest.value().c_str());
   if (patch_status == courgette::C_OK)
     return 0;
 
-  VLOG(1) << "Failed to apply patch " << patch.value() << " using courgette.";
+  VLOG(1) << "Failed to apply patch " << patch.value()
+          << " using courgette. err=" << patch_status;
+
+  // If we ran out of memory or disk space, then these are likely the errors
+  // we will see.  If we run into them, return an error and stay on the
+  // 'ENSEMBLE_PATCHING' update stage.
+  if (patch_status == courgette::C_DISASSEMBLY_FAILED ||
+      patch_status == courgette::C_STREAM_ERROR) {
+    return MEM_ERROR;
+  }
 
   if (installer_state != NULL)
     installer_state->UpdateStage(installer::BINARY_PATCHING);
 
   return ApplyBinaryPatch(src.value().c_str(), patch.value().c_str(),
                           dest.value().c_str());
 }
 
 Version* GetMaxVersionFromArchiveDir(const FilePath& chrome_path) {
   VLOG(1) << "Looking for Chrome version folder under " << chrome_path.value();
@@ skipping 87 matching lines @@
   BY_HANDLE_FILE_INFORMATION info = {};
 
   return (OpenForInfo(program, &handle) &&
           GetInfo(handle, &info) &&
           info.dwVolumeSerialNumber == file_info_.dwVolumeSerialNumber &&
           info.nFileIndexHigh == file_info_.nFileIndexHigh &&
           info.nFileIndexLow == file_info_.nFileIndexLow);
 }
 
 }  // namespace installer