diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 81cd723f705..5c3a2e7b2cb 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -2381,7 +2381,8 @@ nsTextFrame::Reflow(nsIPresContext& aPresContext, // Setup text transformer to transform this frames text content PRUnichar wordBuf[WORD_BUF_SIZE]; nsCOMPtr lb; - doc->GetLineBreaker(getter_AddRefs(lb)); + if (doc) + doc->GetLineBreaker(getter_AddRefs(lb)); nsTextTransformer tx(wordBuf, WORD_BUF_SIZE,lb,nsnull); nsresult rv = tx.Init(this, mContent, startingOffset); if (NS_OK != rv) { diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 81cd723f705..5c3a2e7b2cb 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -2381,7 +2381,8 @@ nsTextFrame::Reflow(nsIPresContext& aPresContext, // Setup text transformer to transform this frames text content PRUnichar wordBuf[WORD_BUF_SIZE]; nsCOMPtr lb; - doc->GetLineBreaker(getter_AddRefs(lb)); + if (doc) + doc->GetLineBreaker(getter_AddRefs(lb)); nsTextTransformer tx(wordBuf, WORD_BUF_SIZE,lb,nsnull); nsresult rv = tx.Init(this, mContent, startingOffset); if (NS_OK != rv) {