From 6088c2756c5ebf7ae29814d1cec1be64fd90c182 Mon Sep 17 00:00:00 2001 From: "roc+@cs.cmu.edu" Date: Wed, 18 Jul 2007 21:32:08 -0700 Subject: [PATCH] Bug 346405. Handle reparenting of empty float lists. r+sr=dbaron --- layout/generic/nsInlineFrame.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index 3ccf389839ec..5ef4bd4310a6 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/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;