Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5586)

Unified Diff: chrome/installer/setup/setup_util.cc

Issue 6677141: Switch out use of std::string and std::vector for large allocations for a buffer class that doesn... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | courgette/adjustment_method.cc » ('j') | courgette/assembly_program.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/setup_util.cc
===================================================================
--- chrome/installer/setup/setup_util.cc (revision 80344)
+++ chrome/installer/setup/setup_util.cc (working copy)
@@ -35,8 +35,17 @@
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);
« no previous file with comments | « no previous file | courgette/adjustment_method.cc » ('j') | courgette/assembly_program.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698