content/app/content_main_runner.cc - Issue 836733006: Fix EnableTerminationOnOutOfMemory for malloc

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/app/content_main_runner.cc

Issue 836733006: Fix EnableTerminationOnOutOfMemory for malloc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix calloc Created 5 years, 11 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:

Index: content/app/content_main_runner.cc

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc

index 87950670b86f5814a7475ed2a66a778673951fe3..6302e96f91078c63a1a285e42b9326c3fd8dfd0d 100644

--- a/content/app/content_main_runner.cc

+++ b/content/app/content_main_runner.cc

@@ -486,6 +486,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {

int Initialize(const ContentMainParams& params) override {

ui_task_ = params.ui_task;

+ base::EnableTerminationOnOutOfMemory();

#if defined(OS_WIN)

RegisterInvalidParamHandler();

ui::win::CreateATLModuleIfNeeded();

@@ -602,7 +603,6 @@ class ContentMainRunnerImpl : public ContentMainRunner {

if (!delegate_ || delegate_->ShouldEnableTerminationOnHeapCorruption())

base::EnableTerminationOnHeapCorruption();

- base::EnableTerminationOnOutOfMemory();

#if !defined(OS_IOS)

SetProcessTitleFromCommandLine(argv);

« no previous file with comments | « base/process/memory_win.cc ('k') | content/app/startup_helper_win.cc » ('j') | no next file with comments »