From 11b1c41d38ce89fbc4afe2249ccbe1ef794ed116 Mon Sep 17 00:00:00 2001
From: "aaronl%netscape.com" <aaronl%netscape.com>
Date: Thu, 1 Nov 2001 07:28:10 +0000
Subject: [PATCH] Bug 107703. Fixes some of the crashes in DOM inspector.
 r=timeless, sr=hewitt

---
 extensions/inspector/base/src/inFlasher.cpp     | 8 ++++----
 extensions/inspector/base/src/inLayoutUtils.cpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/inspector/base/src/inFlasher.cpp b/extensions/inspector/base/src/inFlasher.cpp
index 7924b293796d..df991abf8f3e 100644
--- a/extensions/inspector/base/src/inFlasher.cpp
+++ b/extensions/inspector/base/src/inFlasher.cpp
@@ -87,12 +87,12 @@ inFlasher::RepaintElement(nsIDOMElement* aElement)
   nsCOMPtr<nsIPresContext> pcontext;
   presShell->GetPresContext(getter_AddRefs(pcontext));
 
-  nsIFrame* parentWithView;
+  nsIFrame* parentWithView = nsnull;
   frame->GetParentWithView(pcontext, &parentWithView);
   if (parentWithView) {
-    nsIView* view;
-    parentWithView->GetView(pcontext, &view);
-    if (view) {
+    nsIView* view = nsnull;
+    nsresult rv= parentWithView->GetView(pcontext, &view);
+    if (NS_SUCCEEDED(rv) && view) {
       nsCOMPtr<nsIViewManager> viewManager;
       view->GetViewManager(*getter_AddRefs(viewManager));
       if (viewManager) {
diff --git a/extensions/inspector/base/src/inLayoutUtils.cpp b/extensions/inspector/base/src/inLayoutUtils.cpp
index 97287a89bd0a..bf2a36888a86 100644
--- a/extensions/inspector/base/src/inLayoutUtils.cpp
+++ b/extensions/inspector/base/src/inLayoutUtils.cpp
@@ -123,7 +123,7 @@ nsIFrame*
 inLayoutUtils::GetFrameFor(nsIDOMElement* aElement, nsIPresShell* aShell)
 {
   nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
-  nsIFrame* frame;
+  nsIFrame* frame = nsnull;
   aShell->GetPrimaryFrameFor(content, &frame);
 
   return frame;
@@ -250,7 +250,7 @@ inLayoutUtils::GetScreenOrigin(nsIDOMElement* aElement)
       presShell->GetPresContext(getter_AddRefs(presContext));
       
       if (presContext) {
-        nsIFrame* frame;
+        nsIFrame* frame = nsnull;
         nsresult rv = presShell->GetPrimaryFrameFor(content, &frame);
         
         PRInt32 offsetX = 0;
@@ -259,9 +259,9 @@ inLayoutUtils::GetScreenOrigin(nsIDOMElement* aElement)
         
         while (frame) {
           // Look for a widget so we can get screen coordinates
-          nsIView* view;
+          nsIView* view = nsnull;
           rv = frame->GetView(presContext, &view);
-          if (view) {
+          if (NS_SUCCEEDED(rv) && view) {
             rv = view->GetWidget(*getter_AddRefs(widget));
             if (widget)
               break;