From a553c7ea86efddfc557913bf7c484f3cf5d95b20 Mon Sep 17 00:00:00 2001
From: "rickg%netscape.com"
 <rickg%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 23 Oct 1999 03:06:19 +0000
Subject: [PATCH] fixed infinite-loop bug 17045 by conditioning control loop.
 r=buster

git-svn-id: svn://10.0.0.236/trunk@51627 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/html/style/src/nsStyleUtil.cpp | 4 ++--
 mozilla/content/shared/src/nsStyleUtil.cpp     | 4 ++--
 mozilla/layout/html/style/src/nsStyleUtil.cpp  | 4 ++--
 mozilla/layout/style/nsStyleUtil.cpp           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mozilla/content/html/style/src/nsStyleUtil.cpp b/mozilla/content/html/style/src/nsStyleUtil.cpp
index 670fd11f9bf..38cb6a171cc 100644
--- a/mozilla/content/html/style/src/nsStyleUtil.cpp
+++ b/mozilla/content/html/style/src/nsStyleUtil.cpp
@@ -122,7 +122,7 @@ PRInt32 nsStyleUtil::FindNextSmallerFontSize(nscoord aFontSize, PRInt32 aBasePoi
     }
   }
   else { // smaller than HTML table
-    for (index = 0; ; index--)
+    for (index = 0; -25<index ; index--) //prevent infinite loop (bug 17045)
       if (fontSize > NSTwipsToFloorIntPoints(CalcFontPointSize(index, aBasePointSize, aScalingFactor))) {
         break;
       }
@@ -149,7 +149,7 @@ PRInt32 nsStyleUtil::FindNextLargerFontSize(nscoord aFontSize, PRInt32 aBasePoin
     }
   }
   else {  // smaller than HTML table
-    for (index = 0; ; index--)
+    for (index = 0; -25<index ; index--) //prevent infinite loop (bug 17045)
       if (fontSize > NSTwipsToFloorIntPoints(CalcFontPointSize(index, aBasePointSize, aScalingFactor))) {
         index++;
         break;
diff --git a/mozilla/content/shared/src/nsStyleUtil.cpp b/mozilla/content/shared/src/nsStyleUtil.cpp
index 670fd11f9bf..38cb6a171cc 100644
--- a/mozilla/content/shared/src/nsStyleUtil.cpp
+++ b/mozilla/content/shared/src/nsStyleUtil.cpp
@@ -122,7 +122,7 @@ PRInt32 nsStyleUtil::FindNextSmallerFontSize(nscoord aFontSize, PRInt32 aBasePoi
     }
   }
   else { // smaller than HTML table
-    for (index = 0; ; index--)
+    for (index = 0; -25<index ; index--) //prevent infinite loop (bug 17045)
       if (fontSize > NSTwipsToFloorIntPoints(CalcFontPointSize(index, aBasePointSize, aScalingFactor))) {
         break;
       }
@@ -149,7 +149,7 @@ PRInt32 nsStyleUtil::FindNextLargerFontSize(nscoord aFontSize, PRInt32 aBasePoin
     }
   }
   else {  // smaller than HTML table
-    for (index = 0; ; index--)
+    for (index = 0; -25<index ; index--) //prevent infinite loop (bug 17045)
       if (fontSize > NSTwipsToFloorIntPoints(CalcFontPointSize(index, aBasePointSize, aScalingFactor))) {
         index++;
         break;
diff --git a/mozilla/layout/html/style/src/nsStyleUtil.cpp b/mozilla/layout/html/style/src/nsStyleUtil.cpp
index 670fd11f9bf..38cb6a171cc 100644
--- a/mozilla/layout/html/style/src/nsStyleUtil.cpp
+++ b/mozilla/layout/html/style/src/nsStyleUtil.cpp
@@ -122,7 +122,7 @@ PRInt32 nsStyleUtil::FindNextSmallerFontSize(nscoord aFontSize, PRInt32 aBasePoi
     }
   }
   else { // smaller than HTML table
-    for (index = 0; ; index--)
+    for (index = 0; -25<index ; index--) //prevent infinite loop (bug 17045)
       if (fontSize > NSTwipsToFloorIntPoints(CalcFontPointSize(index, aBasePointSize, aScalingFactor))) {
         break;
       }
@@ -149,7 +149,7 @@ PRInt32 nsStyleUtil::FindNextLargerFontSize(nscoord aFontSize, PRInt32 aBasePoin
     }
   }
   else {  // smaller than HTML table
-    for (index = 0; ; index--)
+    for (index = 0; -25<index ; index--) //prevent infinite loop (bug 17045)
       if (fontSize > NSTwipsToFloorIntPoints(CalcFontPointSize(index, aBasePointSize, aScalingFactor))) {
         index++;
         break;
diff --git a/mozilla/layout/style/nsStyleUtil.cpp b/mozilla/layout/style/nsStyleUtil.cpp
index 670fd11f9bf..38cb6a171cc 100644
--- a/mozilla/layout/style/nsStyleUtil.cpp
+++ b/mozilla/layout/style/nsStyleUtil.cpp
@@ -122,7 +122,7 @@ PRInt32 nsStyleUtil::FindNextSmallerFontSize(nscoord aFontSize, PRInt32 aBasePoi
     }
   }
   else { // smaller than HTML table
-    for (index = 0; ; index--)
+    for (index = 0; -25<index ; index--) //prevent infinite loop (bug 17045)
       if (fontSize > NSTwipsToFloorIntPoints(CalcFontPointSize(index, aBasePointSize, aScalingFactor))) {
         break;
       }
@@ -149,7 +149,7 @@ PRInt32 nsStyleUtil::FindNextLargerFontSize(nscoord aFontSize, PRInt32 aBasePoin
     }
   }
   else {  // smaller than HTML table
-    for (index = 0; ; index--)
+    for (index = 0; -25<index ; index--) //prevent infinite loop (bug 17045)
       if (fontSize > NSTwipsToFloorIntPoints(CalcFontPointSize(index, aBasePointSize, aScalingFactor))) {
         index++;
         break;