Commit 7f362330 authored by Allison Karlitskaya's avatar Allison Karlitskaya

GOption: fix bug in strv mode

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.
parent 6939add2
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment