Merge pull request #25943 from brave/fix-adblock-pref-service-danglin…

…g-access [DanglingPtr] Fix `AdBlockPrefService` dangling access
brave · Oct 11, 2024 · 1dc32e1 · 1dc32e1
2 parents 6c49eae + 289292c
commit 1dc32e1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/components/brave_shields/content/browser/ad_block_pref_service.cc b/components/brave_shields/content/browser/ad_block_pref_service.cc
@@ -86,15 +86,19 @@ AdBlockPrefService::GetLatestProxyConfig(
 void AdBlockPrefService::Shutdown() {
   pref_change_registrar_.reset();
 
-  if (proxy_config_service_) {
-    proxy_config_service_->RemoveObserver(this);
-    proxy_config_service_.reset();
-  }
+  // `pref_proxy_config_tracker_` has a reference to `proxy_config_service_`,
+  // therefore detach `pref_proxy_config_tracker_` first, to prevent the
+  // reference from dangling.
 
   if (pref_proxy_config_tracker_) {
     pref_proxy_config_tracker_->DetachFromPrefService();
     pref_proxy_config_tracker_.reset();
   }
+
+  if (proxy_config_service_) {
+    proxy_config_service_->RemoveObserver(this);
+    proxy_config_service_.reset();
+  }
 }
 
 void AdBlockPrefService::OnPreferenceChanged(const std::string& pref_name) {