Merge pull request #1276 from brave/0.59.x-2799

Issue 2799: Fix tab crash while resizing the devtools window.
brave · Jan 9, 2019 · d8d0367 · d8d0367
2 parents d1ec24b + 6597ae6
commit d8d0367
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/renderer/brave_content_settings_observer_helper.h b/renderer/brave_content_settings_observer_helper.h
@@ -12,7 +12,9 @@
 #include "third_party/blink/renderer/platform/bindings/script_state.h"
 
 static bool AllowFingerprinting(blink::LocalFrame* frame) {
-  if (!frame) return true;
+  if (!frame || !frame->GetContentSettingsClient()) {
+    return true;
+  }
   return frame->GetContentSettingsClient()->AllowFingerprinting(true);
 }