Merge pull request #5341 from brave/farbling-content-setting-fix

check for empty content setting rules
brave · Apr 23, 2020 · 44e12d7 · 44e12d7
2 parents 515a277 + 2693980
commit 44e12d7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/renderer/brave_content_settings_agent_impl.cc b/renderer/brave_content_settings_agent_impl.cc
@@ -70,7 +70,6 @@ ContentSetting GetBraveContentSettingFromRules(
       return rule.GetContentSetting();
     }
   }
-  NOTREACHED();
   return CONTENT_SETTING_DEFAULT;
 }
 
@@ -276,9 +275,13 @@ bool BraveContentSettingsAgentImpl::AllowFingerprinting(
 
 BraveFarblingLevel BraveContentSettingsAgentImpl::GetBraveFarblingLevel() {
   blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
-  ContentSetting setting = GetBraveContentSettingFromRules(
+
+  ContentSetting setting = CONTENT_SETTING_DEFAULT;
+  if (content_setting_rules_) {
+    setting = GetBraveContentSettingFromRules(
         content_setting_rules_->fingerprinting_rules, frame,
         url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL());
+  }
 
   if (base::FeatureList::IsEnabled(
       brave_shields::features::kFingerprintingProtectionV2)) {