slirp: Fix g_array_free to correctly handle freeing an unallocateed GArray. Fix #243
This commit is contained in:
parent
7ad57d7fa8
commit
480c71dea5
1 changed files with 6 additions and 4 deletions
|
@ -300,11 +300,13 @@ gchar *
|
||||||
g_array_free (GArray *array,
|
g_array_free (GArray *array,
|
||||||
gboolean free_segment)
|
gboolean free_segment)
|
||||||
{
|
{
|
||||||
gchar *result = free_segment ? NULL : array->data;
|
gchar *result = ((array == NULL) || free_segment) ? NULL : array->data;
|
||||||
|
|
||||||
|
if (array != NULL) {
|
||||||
if (free_segment)
|
if (free_segment)
|
||||||
free (array->data);
|
free (array->data);
|
||||||
free (array);
|
free (array);
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue