From 83e4f8d0ae335f73afa491164eccdbee2d1d4817 Mon Sep 17 00:00:00 2001
From: "bryner%netscape.com"
 <bryner%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 8 Jun 2002 07:50:34 +0000
Subject: [PATCH] Fix a crash scrolling the address list in the mail compose
 window (bug 142542).  r=ben, sr=jag, a=asa.

git-svn-id: svn://10.0.0.236/trunk@122935 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 0b2adedb9cd..a6a641b5f0e 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -533,6 +533,7 @@ nsTreeBodyFrame::Destroy(nsIPresContext* aPresContext)
   mColumns = nsnull;
   
   // Save off our info into the box object.
+  EnsureBoxObject();
   if (mTreeBoxObject) {
     nsCOMPtr<nsIBoxObject> box(do_QueryInterface(mTreeBoxObject));
     if (mTopRowIndex > 0) {
@@ -564,7 +565,8 @@ nsTreeBodyFrame::EnsureBoxObject()
     if (parent) {
       nsCOMPtr<nsIDocument> parentDoc;
       parent->GetDocument(*getter_AddRefs(parentDoc));
-      NS_ASSERTION(parentDoc, "element has no document!");
+      if (!parentDoc) // there may be no document, if we're called from Destroy()
+        return;
       
       nsCOMPtr<nsIDOMNSDocument> nsDoc = do_QueryInterface(parentDoc);
       nsCOMPtr<nsIBoxObject> box;