Changeset 72788 in webkit

Timestamp:

Nov 29, 2010 4:05:56 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-29 Jan Erik Hanssen <​jhanssen@sencha.com>

Reviewed by Kenneth Rohde Christiansen.

QtWebKit asserts when selecting elided text.
​https://bugs.webkit.org/show_bug.cgi?id=45391

Ensure that the length passed to fromRawDataWithoutRef() does
not exceed the length of the string.

• platform/graphics/qt/FontQt.cpp: (WebCore::Font::selectionRectForSimpleText):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-29  Jan Erik Hanssen  <jhanssen@sencha.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        QtWebKit asserts when selecting elided text.
+        https://bugs.webkit.org/show_bug.cgi?id=45391
+
+        Ensure that the length passed to fromRawDataWithoutRef() does
+        not exceed the length of the string.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::selectionRectForSimpleText):
+
 2010-11-26  Alexander Pavlov  <apavlov@chromium.org>
 

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

@@ -345 +345 @@
     String sanitized = Font::normalizeSpaces(String(run.characters(), run.length()));
     QString wholeText = fromRawDataWithoutRef(sanitized);
-    QString selectedText = fromRawDataWithoutRef(sanitized, from, to - from);
+    QString selectedText = fromRawDataWithoutRef(sanitized, from, qMin(to - from, wholeText.length() - from));
 
     int startX = QFontMetrics(font()).width(wholeText, from, Qt::TextBypassShaping);