From 9dc534916127e40c5154a774507bf1fa965b937c Mon Sep 17 00:00:00 2001
From: "jband%netscape.com"
 <jband%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 8 Nov 2000 06:31:57 +0000
Subject: [PATCH] Add null ptr check to fix bug 59281. r=adamlock sr=waterson

git-svn-id: svn://10.0.0.236/trunk@82422 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsDocShell.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 12b8a8d79c3..d63267a7185 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -2855,6 +2855,10 @@ NS_IMETHODIMP nsDocShell::SetupNewViewer(nsIContentViewer* aNewViewer)
 
    nsCOMPtr<nsIWidget> widget;
    NS_ENSURE_SUCCESS(GetMainWidget(getter_AddRefs(widget)), NS_ERROR_FAILURE);
+   if (!widget) {
+     NS_ERROR("GetMainWidget coughed up a null widget");
+     return NS_ERROR_FAILURE;
+   }
 
    nsRect bounds(x, y, cx, cy);
    NS_ENSURE_SUCCESS(EnsureDeviceContext(), NS_ERROR_FAILURE);