Changeset 156879 in webkit

Timestamp:

Oct 3, 2013, 9:42:02 PM (12 years ago)

Author:

andersca@apple.com

Message:

Assert that we don't try to index past the end of the m_coreTextIndices array
​https://bugs.webkit.org/show_bug.cgi?id=122308

Reviewed by Dan Bernstein.

Because an assertion failure is better than a random crash.

• platform/graphics/mac/ComplexTextController.cpp:

(WebCore::ComplexTextController::ComplexTextRun::indexAt):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/ComplexTextController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-03  Anders Carlsson  <andersca@apple.com>
+
+        Assert that we don't try to index past the end of the m_coreTextIndices array
+        https://bugs.webkit.org/show_bug.cgi?id=122308
+
+        Reviewed by Dan Bernstein.
+
+        Because an assertion failure is better than a random crash.
+
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::ComplexTextController::ComplexTextRun::indexAt):
+
 2013-10-03  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp

@@ -387 +387 @@
 CFIndex ComplexTextController::ComplexTextRun::indexAt(size_t i) const
 {
+    ASSERT(i < m_glyphCount);
+
     return m_coreTextIndices[i];
 }