From 479f972b9566615c8a74d39529f3a9cf4bba6ec7 Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Thu, 25 Apr 2002 20:53:32 +0000 Subject: [PATCH] bug 136746 - check for null pointer if a line is empty. sr=waterson, r=alexsavulov git-svn-id: svn://10.0.0.236/trunk@119857 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockFrame.cpp | 4 ++++ mozilla/layout/html/base/src/nsBlockFrame.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index f0f1d28b57f..acd54894633 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -3113,6 +3113,10 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState, nsresult rv = NS_OK; nsIFrame* frame = aLine->mFirstChild; + if (!frame) { + NS_ASSERTION(PR_FALSE, "program error - unexpected empty line"); + return NS_ERROR_NULL_POINTER; + } // Prepare the block reflow engine const nsStyleDisplay* display; diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index f0f1d28b57f..acd54894633 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -3113,6 +3113,10 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState, nsresult rv = NS_OK; nsIFrame* frame = aLine->mFirstChild; + if (!frame) { + NS_ASSERTION(PR_FALSE, "program error - unexpected empty line"); + return NS_ERROR_NULL_POINTER; + } // Prepare the block reflow engine const nsStyleDisplay* display;