diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-07-21 13:42:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-07-21 13:42:43 +0000 |
| commit | c70489d6ebb4ea3e676beb831935fb3032ad0a39 (patch) | |
| tree | 9ef5cb0b9ed1d2497dad9d1fef6e99e57aa7f72d /gtk/gtkimcontextsimple.c | |
| parent | c095ee26703b6bfc047b40f0841a531d917fada9 (diff) | |
| download | gtk+-c70489d6ebb4ea3e676beb831935fb3032ad0a39.tar.gz | |
0-terminate outbuf in all cases. (#348227, Nguyen Thái Ngoc Duy)
2006-07-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_get_preedit_string):
0-terminate outbuf in all cases. (#348227, Nguyen Thái Ngoc Duy)
Diffstat (limited to 'gtk/gtkimcontextsimple.c')
| -rw-r--r-- | gtk/gtkimcontextsimple.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 3698257601..e6267e514e 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -1540,17 +1540,12 @@ gtk_im_context_simple_get_preedit_string (GtkIMContext *context, } g_assert (len < 25); - outbuf[len] = '\0'; } else if (context_simple->tentative_match) - { - len = g_unichar_to_utf8 (context_simple->tentative_match, outbuf); - } - else - { - outbuf[0] = '\0'; - } + len = g_unichar_to_utf8 (context_simple->tentative_match, outbuf); + outbuf[len] = '\0'; + if (str) *str = g_strdup (outbuf); |