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

x11/xprops: Plug a few memory leaks

Browse Source 
Commits 6dbec6f8, 734402e1 and f041b35b introduced memory leaks by
switching to returning copies instead of the original buffers but
forgetting to free those original buffers.

Some error cases were also not freeing the ->prop buffer as they
should.

https://bugzilla.gnome.org/show_bug.cgi?id=642652
This commit is contained in:
Rui Matos 2017-02-21 15:49:09 +01:00
parent 8f5a0ec83d
commit 5ba38a4ab6
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/x11/xprops.c
View File

@ -304,6 +304,8 @@ motif_hints_from_results (GetPropertyResults *results,
if (results->type == None || results->n_items <= 0)
{
g_free (results->prop);
results->prop = NULL;
meta_verbose ("Motif hints had unexpected type or n_items\n");
return FALSE;
}
@ -314,10 +316,18 @@ motif_hints_from_results (GetPropertyResults *results,
*/
*hints_p = calloc (1, sizeof (MotifWmHints));
if (*hints_p == NULL)
return FALSE;
{
g_free (results->prop);
results->prop = NULL;
return FALSE;
}
memcpy(*hints_p, results->prop, MIN (sizeof (MotifWmHints),
results->n_items * sizeof (uint32_t)));
g_free (results->prop);
results->prop = NULL;
return TRUE;
}
@ -349,6 +359,9 @@ latin1_string_from_results (GetPropertyResults *results,
*str_p = g_strndup ((char *) results->prop, results->n_items);
g_free (results->prop);
results->prop = NULL;
return TRUE;
}
@ -396,6 +409,9 @@ utf8_string_from_results (GetPropertyResults *results,
*str_p = g_strndup ((char *) results->prop, results->n_items);
g_free (results->prop);
results->prop = NULL;
return TRUE;
}
@ -772,7 +788,11 @@ size_hints_from_results (GetPropertyResults *results,
return FALSE;
if (results->n_items < OldNumPropSizeElements)
return FALSE;
{
g_free (results->prop);
results->prop = NULL;
return FALSE;
}
raw = (xPropSizeHints*) results->prop;