luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GOption: fix bug in strv mode

Browse Source 
We are a bit too aggressive about freeing memory in strv mode.  Only
free it in the case that we actually set the pointer to NULL.

Uncovered by the GApplication tests.
This commit is contained in:
Ryan Lortie 2014-02-05 17:11:50 +00:00
parent 6939add283
commit 7f36233042
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/goption.c
View File

@ -1717,9 +1717,6 @@ free_pending_nulls (GOptionContext *context,
if (perform_nulls)
{
if (context->strv_mode)
g_free (*n->ptr);
if (n->value)
{
/* Copy back the short options */
@ -1727,7 +1724,12 @@ free_pending_nulls (GOptionContext *context,
strcpy (*n->ptr + 1, n->value);
}
else
*n->ptr = NULL;
{
if (context->strv_mode)
g_free (*n->ptr);
*n->ptr = NULL;
}
}
g_free (n->value);