aboutsummaryrefslogblamecommitdiff
path: root/www/waterfox/files/patch-bug1411745
blob: f5f25d894da676f54a9703d8ace7cc0c5d9d7179 (plain) (tree)

























                                                                                               
commit 4bd747285cad
Author: Magnus Melin <mkmelin+mozilla@iki.fi>
Date:   Sat Dec 9 16:43:16 2017 +0200

    Bug 1411745 - crash for svg linking to mailbox URI. r=smaug a=gchang
    
    --HG--
    extra : source : 2a01f65ec8af02827f0621f86e501ad236431415
---
 dom/base/nsDocument.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git dom/base/nsDocument.cpp dom/base/nsDocument.cpp
index fe44e902241f..ce511f50e9de 100644
--- dom/base/nsDocument.cpp
+++ dom/base/nsDocument.cpp
@@ -1233,7 +1233,8 @@ nsExternalResourceMap::PendingLoad::OnDataAvailable(nsIRequest* aRequest,
                                                     uint64_t aOffset,
                                                     uint32_t aCount)
 {
-  NS_PRECONDITION(mTargetListener, "Shouldn't be getting called!");
+  // mTargetListener might be null if SetupViewer or AddExternalResource failed.
+  NS_ENSURE_TRUE(mTargetListener, NS_ERROR_FAILURE);
   if (mDisplayDocument->ExternalResourceMap().HaveShutDown()) {
     return NS_BINDING_ABORTED;
   }