luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-17 19:21:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

goption: Don't return pointers to deallocated memory

Browse Source 
g_option_context_parse() can return pointers to deallocated strings, if the
command line contains an unknown option.

https://bugzilla.gnome.org/show_bug.cgi?id=646926
This commit is contained in:
Kjell Ahlstedt 2016-08-31 19:09:52 +02:00 committed by Matthias Clasen
parent 7bf31065cc
commit b12e0b8869
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glib/goption.c
View File

@ -1281,9 +1281,12 @@ parse_arg (GOptionContext *context,
change = get_change (context, G_OPTION_ARG_STRING, change = get_change (context, G_OPTION_ARG_STRING,
entry->arg_data); entry->arg_data);
g_free (change->allocated.str);
change->prev.str = *(gchar **)entry->arg_data; if (!change->allocated.str)
change->prev.str = *(gchar **)entry->arg_data;
else
g_free (change->allocated.str);
change->allocated.str = data; change->allocated.str = data;
*(gchar **)entry->arg_data = data; *(gchar **)entry->arg_data = data;
@ -1345,9 +1348,12 @@ parse_arg (GOptionContext *context,
#endif #endif
change = get_change (context, G_OPTION_ARG_FILENAME, change = get_change (context, G_OPTION_ARG_FILENAME,
entry->arg_data); entry->arg_data);
g_free (change->allocated.str);
change->prev.str = *(gchar **)entry->arg_data; if (!change->allocated.str)
change->prev.str = *(gchar **)entry->arg_data;
else
g_free (change->allocated.str);
change->allocated.str = data; change->allocated.str = data;
*(gchar **)entry->arg_data = data; *(gchar **)entry->arg_data = data;