fixes #39 - Insert test to stop loop if we are never going to find a …

…line to break on.
danfickle · Aug 8, 2015 · 9b9135f · 9b9135f
1 parent 7499dd4
commit 9b9135f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/neo-flying-saucer-core/src/main/java/com/github/neoflyingsaucer/layout/Breaker.java b/neo-flying-saucer-core/src/main/java/com/github/neoflyingsaucer/layout/Breaker.java
@@ -190,6 +190,11 @@ else if (width >= avail)
             	width = c.getTextRenderer().getWidth(c.getFontContext(), font, broken);
             	last--;
             }
+
+            if (last == 0)
+            {
+            	context.setUnbreakable(true);
+            }
         }
 
         context.setWidth(width);

diff --git a/neo-flying-saucer-core/src/main/java/com/github/neoflyingsaucer/layout/InlineBoxing.java b/neo-flying-saucer-core/src/main/java/com/github/neoflyingsaucer/layout/InlineBoxing.java
@@ -173,7 +173,7 @@ public static void layoutContent(final LayoutContext c, final BlockBox box, fina
                     if (lbContext.getStart() == 0) {
                         fit += pendingLeftMBP + pendingRightMBP;
                     }
-
+                    
                     boolean trimmedLeadingSpace = false;
                     if (hasTrimmableLeadingSpace(
                             currentLine, style, lbContext, zeroWidthInlineBlock)) {
@@ -205,6 +205,12 @@ public static void layoutContent(final LayoutContext c, final BlockBox box, fina
                         lbContext.saveEnd();
                         final InlineText inlineText = layoutText(
                                 c, iB.getStyle(), remainingWidth - fit, lbContext, false);
+
+                        if (lbContext.isUnbreakable() && lbContext.getWidth() >= maxAvailableWidth - fit)
+                        {
+                        	break;
+                        }
+
                         if (lbContext.isUnbreakable() && ! currentLine.isContainsContent()) {
                             final int delta = c.getBlockFormattingContext().getNextLineBoxDelta(c, currentLine, maxAvailableWidth);
                             if (delta > 0) {

diff --git a/neo-flying-saucer-tests/src/test/java/com/github/neoflyingsaucer/test/pdf/TestPage.java b/neo-flying-saucer-tests/src/test/java/com/github/neoflyingsaucer/test/pdf/TestPage.java
@@ -309,8 +309,7 @@ public void testListStyleTypeDisc()
 		pdf.assertContains(drawEllipseOperation);
 	}
 
-	@Test
-	@Ignore("Failing (infinite loop somewhere in code)")
+	@Test // Regression test
 	public void testInfiniteLoopBugOnTooWideContent()
 	{
 		PdfTest pdf = new PdfTest("InfiniteLoopBugOnTooWideContent");