diff -r 56cd8111b7f7 -r 41300fa6a67c tests/auto/qtextlayout/tst_qtextlayout.cpp
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -118,6 +118,7 @@
     void smallTextLengthWordWrap();
     void smallTextLengthWrapAtWordBoundaryOrAnywhere();
     void testLineBreakingAllSpaces();
+    void lineWidthFromBOM();
 
 
 private:
@@ -1114,14 +1115,14 @@
     QTextOption option = layout.textOption();
     QList<QTextOption::Tab> tabs;
     QTextOption::Tab tab;
-    tab.position = 200;
+    tab.position = 300;
     tabs.append(tab);
 
-    tab.position = 400;
+    tab.position = 600;
     tab.type = QTextOption::RightTab;
     tabs.append(tab);
 
-    tab.position = 600;
+    tab.position = 800;
     tab.type = QTextOption::CenterTab;
     tabs.append(tab);
     option.setTabs(tabs);
@@ -1306,6 +1307,18 @@
 
 }
 
+void tst_QTextLayout::lineWidthFromBOM()
+{
+    const QString string(QChar(0xfeff)); // BYTE ORDER MARK
+    QTextLayout layout(string);
+    layout.beginLayout();
+    QTextLine line = layout.createLine();
+    line.setLineWidth(INT_MAX / 256);
+    layout.endLayout();
+
+    // Don't spin into an infinite loop
+ }
+
 
 QTEST_MAIN(tst_QTextLayout)
 #include "tst_qtextlayout.moc"