From 05ff888e16cb3e6914c6bf34c8ea9438c7fa249e Mon Sep 17 00:00:00 2001 From: "rpotts%netscape.com" Date: Sat, 1 Aug 1998 06:45:43 +0000 Subject: [PATCH] Added check to see if DocLoader exists before dereferencing the pointer... git-svn-id: svn://10.0.0.236/trunk@7024 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 6 ++++-- mozilla/webshell/src/nsWebShell.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 6e90298c514..91e07122cc9 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -263,8 +263,10 @@ nsWebShell::nsWebShell() nsWebShell::~nsWebShell() { // Stop any pending document loads and destroy the loader... - mDocLoader->Stop(); - NS_IF_RELEASE(mDocLoader); + if (nsnull != mDocLoader) { + mDocLoader->Stop(); + NS_RELEASE(mDocLoader); + } NS_IF_RELEASE(mInnerWindow); diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 6e90298c514..91e07122cc9 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -263,8 +263,10 @@ nsWebShell::nsWebShell() nsWebShell::~nsWebShell() { // Stop any pending document loads and destroy the loader... - mDocLoader->Stop(); - NS_IF_RELEASE(mDocLoader); + if (nsnull != mDocLoader) { + mDocLoader->Stop(); + NS_RELEASE(mDocLoader); + } NS_IF_RELEASE(mInnerWindow);