From ff7dcd851eab996935594cd9986256de2ca74c1e Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
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 085677d58..3ebf03d4b 100644
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@@ -766,5 +766,12 @@ patches = [
     # It is a bit hacky, not suitable for merging into upstream.
     # https://chromium-review.googlesource.com/c/chromium/src/+/5302103
     'name': 'osr_win_remove_keyed_mutex_2575'
+  },
+  {
+    # 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<UnretainedDanglingPtrMode>
+     kUnretainedDanglingPtrModeParam = {
+         &kPartitionAllocUnretainedDanglingPtr,
+         "mode",
+-        UnretainedDanglingPtrMode::kCrash,
++        UnretainedDanglingPtrMode::kDumpWithoutCrashing,
+         &kUnretainedDanglingPtrModeOption,
+ };
+