Merge pull request 'Follow-up: Ensure document is not null in nsImageLoadingContent::BindToTree' (#2147) from FranklinDM/UXP-contrib:work_wc-image-followup into master

Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2147

1 files changed, 7 insertions, 5 deletions

diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp
index 5e5e4666c4..f99c5c6a73 100644
--- a/dom/base/nsImageLoadingContent.cpp
+++ b/dom/base/nsImageLoadingContent.cpp
@@ -1413,13 +1413,15 @@ nsImageLoadingContent::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
                                   bool aCompileEventHandlers)
 {
   // We may be getting connected and our image should be tracked.
-  if (GetOurCurrentDoc()) {
-    TrackImage(mCurrentRequest);
-    TrackImage(mPendingRequest);
-  }
+  nsCOMPtr<nsIDocument> doc = GetOurCurrentDoc();
+  if (!doc)
+    return;
+
+  TrackImage(mCurrentRequest);
+  TrackImage(mPendingRequest);
 
   if (mCurrentRequestFlags & REQUEST_BLOCKS_ONLOAD)
-    aDocument->BlockOnload();
+    doc->BlockOnload();
 }
 
 void