Changeset 146761 in webkit

Timestamp:

Mar 25, 2013 6:06:57 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] REGRESSION(r146630): 8 text related test asserts on debug builds
​https://bugs.webkit.org/show_bug.cgi?id=113179

Reviewed by Jocelyn Turcotte.

Test if range.start is within the valid range before testing the value at that point.

• platform/graphics/qt/FontQt.cpp:

(WebCore::Font::initFormatForTextLayout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/FontQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-25  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] REGRESSION(r146630): 8 text related test asserts on debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=113179
+
+        Reviewed by Jocelyn Turcotte.
+
+        Test if range.start is within the valid range before testing the value at that point.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::initFormatForTextLayout):
+
 2013-03-25  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/platform/graphics/qt/FontQt.cpp

@@ -253 +253 @@
     // word-spacing along with other options would be applied to. This is safe since the other
     // formatting options does not affect spaces.
-    unsigned length = layout->text().length();
-    for (range.start = 0; treatAsSpace(run[range.start]) && range.start < length; ++range.start) { }
+    unsigned length = run.length();
+    for (range.start = 0; range.start < length && treatAsSpace(run[range.start]); ++range.start) { }
     range.length = length - range.start;