Commit 931d092b authored by rsesek's avatar rsesek Committed by Commit bot

Remove 32-bit Mac implementation of EnableTerminationOnHeapCorruption().

This removes CrMallocErrorBreak, since in 64-bit mode, Libc's malloc already
makes this case fatal.

BUG=453141
R=mark@chromium.org

Review URL: https://codereview.chromium.org/889583003

Cr-Commit-Position: refs/heads/master@{#313728}
parent d9203971
...@@ -903,7 +903,6 @@ component("base") { ...@@ -903,7 +903,6 @@ component("base") {
"native_library_posix.cc", "native_library_posix.cc",
"strings/sys_string_conversions_posix.cc", "strings/sys_string_conversions_posix.cc",
] ]
deps += [ "//third_party/mach_override" ]
} else { } else {
# Non-Mac. # Non-Mac.
sources -= [ sources -= [
......
...@@ -201,9 +201,6 @@ ...@@ -201,9 +201,6 @@
'$(SDKROOT)/System/Library/Frameworks/Security.framework', '$(SDKROOT)/System/Library/Frameworks/Security.framework',
], ],
}, },
'dependencies': [
'../third_party/mach_override/mach_override.gyp:mach_override',
],
}], }],
['OS == "ios" and _toolset != "host"', { ['OS == "ios" and _toolset != "host"', {
'link_settings': { 'link_settings': {
......
This diff is collapsed.
...@@ -150,10 +150,8 @@ TEST(ProcessMemoryTest, MacTerminateOnHeapCorruption) { ...@@ -150,10 +150,8 @@ TEST(ProcessMemoryTest, MacTerminateOnHeapCorruption) {
ASSERT_DEATH(free(buf), "attempting free on address which " ASSERT_DEATH(free(buf), "attempting free on address which "
"was not malloc\\(\\)-ed"); "was not malloc\\(\\)-ed");
#else #else
ASSERT_DEATH(free(buf), "being freed.*\\n?\\.*" ADD_FAILURE() << "This test is not supported in this build configuration.";
"\\*\\*\\* set a breakpoint in malloc_error_break to debug.*\\n?.*" #endif
"Terminating process due to a potential for future heap corruption");
#endif // ARCH_CPU_64_BITS || defined(ADDRESS_SANITIZER)
} }
#endif // defined(OS_MACOSX) #endif // defined(OS_MACOSX)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment