From cfef3fa48769007c86a0e19248aacf72c27f146f Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Wed, 8 Mar 2023 12:08:39 +0800 Subject: [PATCH] Issue #2135 - Follow-up: Ensure document is not null in nsImageLoadingContent::BindToTree --- dom/base/nsImageLoadingContent.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp index 338d21291e..26fa18df99 100644 --- a/dom/base/nsImageLoadingContent.cpp +++ b/dom/base/nsImageLoadingContent.cpp @@ -1431,13 +1431,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 doc = GetOurCurrentDoc(); + if (!doc) + return; + + TrackImage(mCurrentRequest); + TrackImage(mPendingRequest); if (mCurrentRequestFlags & REQUEST_BLOCKS_ONLOAD) - aDocument->BlockOnload(); + doc->BlockOnload(); } void