From d063da77e97da8d7a04edca082971f8948a42ac1 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Mon, 1 Oct 2001 23:57:57 +0000 Subject: [PATCH] Move the zero-check to before we divide by the number. Fixes crash when all 3 header or all 3 footer print prefs are empty strings. Bug 102257, r=rods, sr=shaver git-svn-id: svn://10.0.0.236/trunk@104358 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsPageFrame.cpp | 2 +- mozilla/layout/html/base/src/nsPageFrame.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp index e57a7a8ef9f..10ac9480789 100644 --- a/mozilla/layout/generic/nsPageFrame.cpp +++ b/mozilla/layout/generic/nsPageFrame.cpp @@ -427,8 +427,8 @@ nsPageFrame::DrawHeaderFooter(nsIRenderingContext& aRenderingContext, if (!aStr2.IsEmpty()) numStrs++; if (!aStr3.IsEmpty()) numStrs++; - nscoord strSpace = aRect.width / numStrs; if (numStrs == 0) return; + nscoord strSpace = aRect.width / numStrs; if (!aStr1.IsEmpty()) { DrawHeaderFooter(aRenderingContext, aFrame, aHeaderFooter, nsIPrintOptions::kJustLeft, aStr1, aRect, aHeight, strSpace); diff --git a/mozilla/layout/html/base/src/nsPageFrame.cpp b/mozilla/layout/html/base/src/nsPageFrame.cpp index e57a7a8ef9f..10ac9480789 100644 --- a/mozilla/layout/html/base/src/nsPageFrame.cpp +++ b/mozilla/layout/html/base/src/nsPageFrame.cpp @@ -427,8 +427,8 @@ nsPageFrame::DrawHeaderFooter(nsIRenderingContext& aRenderingContext, if (!aStr2.IsEmpty()) numStrs++; if (!aStr3.IsEmpty()) numStrs++; - nscoord strSpace = aRect.width / numStrs; if (numStrs == 0) return; + nscoord strSpace = aRect.width / numStrs; if (!aStr1.IsEmpty()) { DrawHeaderFooter(aRenderingContext, aFrame, aHeaderFooter, nsIPrintOptions::kJustLeft, aStr1, aRect, aHeight, strSpace);