luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-05 23:48:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

gio-tool: Do not leak GOptionContext

Browse Source 
GOptionContext is freed only in case of success. Free the context
also in case of failure.

https://bugzilla.gnome.org/show_bug.cgi?id=776169
This commit is contained in:
Ondrej Holy
2016-12-19 12:11:13 +01:00
parent 292f10d053
commit fb7d2184a6
16 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gio-tool-set.c
View File

@@ -96,6 +96,7 @@ handle_set (int argc, char *argv[], gboolean do_help)
if (do_help)
{
show_help (context, NULL);
g_option_context_free (context);
return 0;
}
@@ -103,18 +104,21 @@ handle_set (int argc, char *argv[], gboolean do_help)
{
show_help (context, error->message);
g_error_free (error);
g_option_context_free (context);
return 1;
}
if (argc < 2)
{
show_help (context, _("Location not specified"));
g_option_context_free (context);
return 1;
}
if (argc < 3)
{
show_help (context, _("Attribute not specified"));
g_option_context_free (context);
return 1;
}
@@ -124,12 +128,14 @@ handle_set (int argc, char *argv[], gboolean do_help)
if ((argc < 4) && (type != G_FILE_ATTRIBUTE_TYPE_INVALID))
{
show_help (context, _("Value not specified"));
g_option_context_free (context);
return 1;
}
if ((argc > 4) && (type != G_FILE_ATTRIBUTE_TYPE_STRINGV))
{
show_help (context, _("Too many arguments"));
g_option_context_free (context);
return 1;
}