From d595c6b405b2ab8242befef7ae0a384d503bd9b2 Mon Sep 17 00:00:00 2001
From: "roc+%cs.cmu.edu" <roc+%cs.cmu.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 19 Jul 2007 04:32:08 +0000
Subject: [PATCH] Bug 346405. Handle reparenting of empty float lists.
 r+sr=dbaron

git-svn-id: svn://10.0.0.236/trunk@230270 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsInlineFrame.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp
index 3ccf389839e..5ef4bd4310a 100644
--- a/mozilla/layout/generic/nsInlineFrame.cpp
+++ b/mozilla/layout/generic/nsInlineFrame.cpp
@@ -252,6 +252,10 @@ nsInlineFrame::ReparentFloatsForInlineChild(nsIFrame* aOurLineContainer,
   NS_ASSERTION(aOurLineContainer->GetNextContinuation() ||
                aOurLineContainer->GetPrevContinuation(),
                "Don't call this when we have no continuation, it's a waste");
+  if (!aFrame) {
+    NS_ASSERTION(aReparentSiblings, "Why did we get called?");
+    return;
+  }
 
   nsIFrame* ancestor = aFrame;
   nsIFrame* ancestorBlockChild;