From fb75f1cb8607f69bff62c4e0521e59cfc4ae3958 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Fri, 5 Sep 2003 20:35:04 +0000 Subject: [PATCH] Bug #217459 r/sr=darin, a=asa Null check for docshell git-svn-id: svn://10.0.0.236/trunk@146581 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/webBrowser/nsWebBrowserContentPolicy.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp index 26803734278..9063ad954ef 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp @@ -50,8 +50,10 @@ nsWebBrowserContentPolicy::ShouldLoad(PRInt32 contentType, return NS_OK; nsCOMPtr shell; - if (NS_FAILED(scriptGlobal->GetDocShell(getter_AddRefs(shell)))) - return NS_OK; + scriptGlobal->GetDocShell(getter_AddRefs(shell)); + /* We're going to dereference shell, so make sure it isn't null */ + if (!shell) + return NS_OK; switch (contentType) { case nsIContentPolicy::OBJECT: