From aad216bf565cb9f302b8825c5d9c3a40680df1d6 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 17 May 2024 20:40:18 -0400 Subject: [PATCH] Revert "Revert unretained dangling ptr detector crash by default (fixes #3693)" This reverts commit 8283317cb1b1289bbe362bb33b7ceaea631227ff. --- patch/patch.cfg | 7 ------- ..._allocator_unretained_dangling_ptr_5351597.patch | 13 ------------- 2 files changed, 20 deletions(-) delete mode 100644 patch/patches/base_allocator_unretained_dangling_ptr_5351597.patch diff --git a/patch/patch.cfg b/patch/patch.cfg index 5bfc6ad31..ccda02fae 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -796,13 +796,6 @@ patches = [ # 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' - }, { # Fix deadlock with enable_backup_ref_ptr_instance_tracer=true # https://issues.chromium.org/issues/340815319 diff --git a/patch/patches/base_allocator_unretained_dangling_ptr_5351597.patch b/patch/patches/base_allocator_unretained_dangling_ptr_5351597.patch deleted file mode 100644 index 388ff68c0..000000000 --- a/patch/patches/base_allocator_unretained_dangling_ptr_5351597.patch +++ /dev/null @@ -1,13 +0,0 @@ -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, - }; -