AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkLabelAccessible: Sanity check _get_text() input values

Browse Source
This commit is contained in:
Bastien Nocera 2013-03-06 15:46:51 +01:00
parent bb4cff8ecf
commit 32825a66ac
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/a11y/gtklabelaccessible.c
View File

@ -307,7 +307,21 @@ gtk_label_accessible_get_text (AtkText *atk_text,
text = gtk_label_get_text (GTK_LABEL (widget));
if (text)
return g_utf8_substring (text, start_pos, end_pos > -1 ? end_pos : g_utf8_strlen (text, -1));
{
guint length;
const gchar *start, *end;
length = g_utf8_strlen (text, -1);
if (end_pos < 0 || end_pos > length)
end_pos = length;
if (start_pos > length)
start_pos = length;
if (end_pos <= start_pos)
return g_strdup ("");
start = g_utf8_offset_to_pointer (text, start_pos);
end = g_utf8_offset_to_pointer (start, end_pos - start_pos);
return g_strndup (start, end - start);
}
return NULL;
}