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;