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

Properly check result of g_utf8_get_char_validated()

Browse Source 
g_utf8_get_char_validated() may return -1 or -2
return type is gunichar(guint32)

Therefore such checks like 'gunichar < 0' or 'gunichar > 0'
are always 'false' or 'true'(except when gunichar == 0).

Signed-off-by: Maks Naumov <maksqwe1@ukr.net>

https://bugzilla.gnome.org/show_bug.cgi?id=742774
This commit is contained in:
Maks Naumov 2015-01-11 11:27:37 -08:00 committed by Matthias Clasen
parent 07cf489d2d
commit 87d36885ac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkbuilder.c
View File

@ -1784,7 +1784,7 @@ gtk_builder_value_from_string (GtkBuilder *builder,
gunichar c;
g_value_init (value, G_TYPE_UINT);
c = g_utf8_get_char_validated (string, strlen (string));
if (c > 0)
if (c != 0 && c != (gunichar)-1 && c != (gunichar)-2)
g_value_set_uint (value, c);
return TRUE;
}

2
modules/input/gtkimcontextthai.c
View File

@ -195,7 +195,7 @@ get_previous_char (GtkIMContextThai *context_thai, gint offset)
if (offset == 0)
{
prev_char = g_utf8_get_char_validated (q, p - q);
if (prev_char < 0)
if (prev_char == (gunichar)-1 || prev_char == (gunichar)-2)
prev_char = 0;
}
g_free (surrounding);