Changeset 46342 in webkit

Timestamp:

Jul 24, 2009 1:42:35 AM (15 years ago)

Author:

xan@webkit.org

Message:

2009-07-22 Xan Lopez <​xlopez@igalia.com>

Reviewed by Jan Alonzo.

​https://bugs.webkit.org/show_bug.cgi?id=25415
[GTK][ATK] Please implement support for get_text_at_offset

Fix confusion in g_substr between length in bytes and length in
characters. Was causing crashes in some situations when dealing
with non-ASCII text encoded as UTF8.

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (g_substr):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-24  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Jan Alonzo.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25415
+        [GTK][ATK] Please implement support for get_text_at_offset
+
+        Fix confusion in g_substr between length in bytes and length in
+        characters. Was causing crashes in some situations when dealing
+        with non-ASCII text encoded as UTF8.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (g_substr):
+
 2009-07-24  Joseph Pecoraro  <joepeck02@gmail.com>
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -572 +572 @@
 static gchar* g_substr(const gchar* string, gint start, gint end)
 {
-    gsize len = end - start + 1;
-    gchar* output = static_cast<gchar*>(g_malloc0(len + 1));
-    return g_utf8_strncpy(output, string +start, len);
+    ASSERT(string);
+    glong strLen = g_utf8_strlen(string, -1);
+    if (start > strLen || end > strLen)
+        return 0;
+    gchar* startPtr = g_utf8_offset_to_pointer(string, start);
+    gsize lenInBytes = g_utf8_offset_to_pointer(string, end) -  startPtr + 1;
+    gchar* output = static_cast<gchar*>(g_malloc0(lenInBytes + 1));
+    return g_utf8_strncpy(output, startPtr, end - start + 1);
 }