From 69ce47ae4c662288e438dcfd4d6902e28ffd2370 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 6 May 2024 16:50:44 -0400 Subject: [PATCH] Revert unretained dangling ptr detector crash by default (fixes #3693) --- patch/patch.cfg | 7 +++++++ ..._allocator_unretained_dangling_ptr_5351597.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 patch/patches/base_allocator_unretained_dangling_ptr_5351597.patch diff --git a/patch/patch.cfg b/patch/patch.cfg index 8a7f939e7..89d2a5845 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -801,5 +801,12 @@ patches = [ # Reverts # https://chromium-review.googlesource.com/c/chromium/src/+/5454331 'name': 'win_partition_freelist_entry_336007395' + }, + { + # Revert unretained dangling ptr detector crash by default. + # https://github.com/chromiumembedded/cef/issues/3693 + # Reverts + # https://chromium-review.googlesource.com/c/chromium/src/+/5351597 + 'name': 'base_allocator_unretained_dangling_ptr_5351597' } ] diff --git a/patch/patches/base_allocator_unretained_dangling_ptr_5351597.patch b/patch/patches/base_allocator_unretained_dangling_ptr_5351597.patch new file mode 100644 index 000000000..388ff68c0 --- /dev/null +++ b/patch/patches/base_allocator_unretained_dangling_ptr_5351597.patch @@ -0,0 +1,13 @@ +diff --git base/allocator/partition_alloc_features.cc base/allocator/partition_alloc_features.cc +index a2616fced0f5b..cacd41b0ffa23 100644 +--- base/allocator/partition_alloc_features.cc ++++ base/allocator/partition_alloc_features.cc +@@ -36,7 +36,7 @@ const base::FeatureParam + kUnretainedDanglingPtrModeParam = { + &kPartitionAllocUnretainedDanglingPtr, + "mode", +- UnretainedDanglingPtrMode::kCrash, ++ UnretainedDanglingPtrMode::kDumpWithoutCrashing, + &kUnretainedDanglingPtrModeOption, + }; +