AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-15 05:00:09 +00:00
Code Issues Projects Releases Wiki Activity

accelgroup: Restructure gtk_accelerator_name

Browse Source 
To fix invalid reads and make the function a bit shorter while we're at
it.

Fixes #2602
This commit is contained in:
Timm Bäder 2020-04-10 09:54:02 +02:00
parent 7bc4daae2f
commit e583349956
1 changed files with 37 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
gtk/gtkaccelgroup.c
View File

@ -570,20 +570,28 @@ gtk_accelerator_name_with_keycode (GdkDisplay *display,
* *
* Returns: a newly-allocated accelerator name * Returns: a newly-allocated accelerator name
*/ */
gchar* char *
gtk_accelerator_name (guint accelerator_key, gtk_accelerator_name (guint accelerator_key,
GdkModifierType accelerator_mods) GdkModifierType accelerator_mods)
{ {
static const gchar text_shift[] = "<Shift>"; static const struct {
static const gchar text_control[] = "<Control>"; guint mask;
static const gchar text_alt[] = "<Alt>"; const char *text;
static const gchar text_meta[] = "<Meta>"; gsize text_len;
static const gchar text_super[] = "<Super>"; } mask_text[] = {
static const gchar text_hyper[] = "<Hyper>"; { GDK_SHIFT_MASK, "<Shift>", strlen ("<Shift>") },
{ GDK_CONTROL_MASK, "<Control>", strlen ("<Control>") },
{ GDK_ALT_MASK, "<Alt>", strlen ("<Alt>") },
{ GDK_META_MASK, "<Meta>", strlen ("<Meta>") },
{ GDK_SUPER_MASK, "<Super>", strlen ("<Super>") },
{ GDK_HYPER_MASK, "<Hyper>", strlen ("<Hyper>") }
};
GdkModifierType saved_mods; GdkModifierType saved_mods;
guint l; guint l;
guint name_len;
const char *keyval_name; const char *keyval_name;
gchar *accelerator; char *accelerator;
int i;
accelerator_mods &= GDK_MODIFIER_MASK; accelerator_mods &= GDK_MODIFIER_MASK;
@ -591,57 +599,34 @@ gtk_accelerator_name (guint accelerator_key,
if (!keyval_name) if (!keyval_name)
keyval_name = ""; keyval_name = "";
saved_mods = accelerator_mods; name_len = strlen (keyval_name);
l = strlen (keyval_name);
if (accelerator_mods & GDK_SHIFT_MASK)
l += sizeof (text_shift) - 1;
if (accelerator_mods & GDK_CONTROL_MASK)
l += sizeof (text_control) - 1;
if (accelerator_mods & GDK_ALT_MASK)
l += sizeof (text_alt) - 1;
if (accelerator_mods & GDK_META_MASK)
l += sizeof (text_meta) - 1;
if (accelerator_mods & GDK_HYPER_MASK)
l += sizeof (text_hyper) - 1;
if (accelerator_mods & GDK_SUPER_MASK)
l += sizeof (text_super) - 1;
accelerator = g_new (gchar, l + 1); saved_mods = accelerator_mods;
for (i = 0; i < G_N_ELEMENTS (mask_text); i++)
{
if (accelerator_mods & mask_text[i].mask)
name_len += mask_text[i].text_len;
}
if (name_len == 0)
return g_strdup (keyval_name);
name_len += 1; /* NUL byte */
accelerator = g_new (char, name_len);
accelerator_mods = saved_mods; accelerator_mods = saved_mods;
l = 0; l = 0;
accelerator[l] = 0; for (i = 0; i < G_N_ELEMENTS (mask_text); i++)
if (accelerator_mods & GDK_SHIFT_MASK)
{ {
strcpy (accelerator + l, text_shift); if (accelerator_mods & mask_text[i].mask)
l += sizeof (text_shift) - 1; {
} strcpy (accelerator + l, mask_text[i].text);
if (accelerator_mods & GDK_CONTROL_MASK) l += mask_text[i].text_len;
{ }
strcpy (accelerator + l, text_control);
l += sizeof (text_control) - 1;
}
if (accelerator_mods & GDK_ALT_MASK)
{
strcpy (accelerator + l, text_alt);
l += sizeof (text_alt) - 1;
}
if (accelerator_mods & GDK_META_MASK)
{
strcpy (accelerator + l, text_meta);
l += sizeof (text_meta) - 1;
}
if (accelerator_mods & GDK_HYPER_MASK)
{
strcpy (accelerator + l, text_hyper);
l += sizeof (text_hyper) - 1;
}
if (accelerator_mods & GDK_SUPER_MASK)
{
strcpy (accelerator + l, text_super);
l += sizeof (text_super) - 1;
} }
strcpy (accelerator + l, keyval_name); strcpy (accelerator + l, keyval_name);
accelerator[name_len - 1] = '\0';
return accelerator; return accelerator;
} }