Bug 1183491. Null-check the document we get from our contentWindow in the contentDocument getter, because apparently it can end up null. r=bkelly

2015-07-30 13:55:16 -04:00
parent cdc4ad1f23
commit 6804837a6e
1 changed files with 3 additions and 0 deletions
--- a/dom/html/nsGenericHTMLFrameElement.cpp
+++ b/dom/html/nsGenericHTMLFrameElement.cpp
@@ -91,6 +91,9 @@ nsGenericHTMLFrameElement::GetContentDocument()
  }

  nsIDocument *doc = win->GetDoc();
+  if (!doc) {
+    return nullptr;
+  }

  // Return null for cross-origin contentDocument.
  if (!nsContentUtils::SubjectPrincipal()->