brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xprops: Use g_strdup in class_hint_from_results()

Browse Source 
Use g_strdup instead of malloc + strcpy, this also gets rid of a bunch
of error checking which is no longer necessary, also adjust the free
path accordingly.

Note that there was a malloc + XFree mismatch in the removed error-handling.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/786
This commit is contained in:
Hans de Goede 2019-09-09 11:28:00 +02:00 committed by Jonas Ådahl
parent eb8a1f42bc
commit e153524748
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/x11/xprops.c
View File

@ -727,7 +727,7 @@ static gboolean
class_hint_from_results (GetPropertyResults *results, class_hint_from_results (GetPropertyResults *results,
XClassHint *class_hint) XClassHint *class_hint)
{ {
int len_name, len_class; int len_name;
class_hint->res_class = NULL; class_hint->res_class = NULL;
class_hint->res_name = NULL; class_hint->res_name = NULL;
@ -735,31 +735,13 @@ class_hint_from_results (GetPropertyResults *results,
if (!validate_or_free_results (results, 8, XA_STRING, FALSE)) if (!validate_or_free_results (results, 8, XA_STRING, FALSE))
return FALSE; return FALSE;
len_name = strlen ((char *) results->prop); class_hint->res_name = g_strdup ((char *) results->prop);
if (! (class_hint->res_name = malloc (len_name+1)))
{
g_free (results->prop);
results->prop = NULL;
return FALSE;
}
strcpy (class_hint->res_name, (char *)results->prop);
len_name = strlen (class_hint->res_name);
if (len_name == (int) results->n_items) if (len_name == (int) results->n_items)
len_name--; class_hint->res_class = g_strdup ("");
else
len_class = strlen ((char *)results->prop + len_name + 1); class_hint->res_class = g_strdup ((char *) results->prop + len_name + 1);
if (! (class_hint->res_class = malloc(len_class+1)))
{
XFree(class_hint->res_name);
class_hint->res_name = NULL;
g_free (results->prop);
results->prop = NULL;
return FALSE;
}
strcpy (class_hint->res_class, (char *)results->prop + len_name + 1);
g_free (results->prop); g_free (results->prop);
results->prop = NULL; results->prop = NULL;
@ -1092,8 +1074,8 @@ free_value (MetaPropValue *value)
g_free (value->v.wm_hints); g_free (value->v.wm_hints);
break; break;
case META_PROP_VALUE_CLASS_HINT: case META_PROP_VALUE_CLASS_HINT:
free (value->v.class_hint.res_class); g_free (value->v.class_hint.res_class);
free (value->v.class_hint.res_name); g_free (value->v.class_hint.res_name);
break; break;
case META_PROP_VALUE_SIZE_HINTS: case META_PROP_VALUE_SIZE_HINTS:
free (value->v.size_hints.hints); free (value->v.size_hints.hints);