From 1d5ae86d11de7cfa2a7620c0df1278378df1a9f8 Mon Sep 17 00:00:00 2001 From: "rginda%netscape.com" Date: Tue, 7 Dec 1999 22:04:52 +0000 Subject: [PATCH] Adding check for null document. Prevents crash described in bug 20677. r=brendan@mozilla.org git-svn-id: svn://10.0.0.236/trunk@55596 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsTextFrame.cpp | 3 +++ mozilla/layout/html/base/src/nsTextFrame.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 25d56cd6080..1b33604e136 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -2819,6 +2819,9 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext, // Setup text transformer to transform this frames text content nsCOMPtr doc; mContent->GetDocument(*getter_AddRefs(doc)); + if (NS_WARN_IF_FALSE(doc, "Content has no document.")) { + return NS_ERROR_FAILURE; + } nsCOMPtr lb; doc->GetLineBreaker(getter_AddRefs(lb)); nsTextTransformer tx(lb, nsnull); diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 25d56cd6080..1b33604e136 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -2819,6 +2819,9 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext, // Setup text transformer to transform this frames text content nsCOMPtr doc; mContent->GetDocument(*getter_AddRefs(doc)); + if (NS_WARN_IF_FALSE(doc, "Content has no document.")) { + return NS_ERROR_FAILURE; + } nsCOMPtr lb; doc->GetLineBreaker(getter_AddRefs(lb)); nsTextTransformer tx(lb, nsnull);