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

Merge branch 'goption_add_sanity_checks_to_inputs' into 'master'

Browse Source 
goption: add sanity check to input parameters

Closes #1057

See merge request GNOME/glib!1073
This commit is contained in:
Philip Withnall 2019-08-30 06:50:45 +00:00
commit 202c07e904
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/goption.c
View File

@ -655,6 +655,7 @@ g_option_context_add_main_entries (GOptionContext *context,
const GOptionEntry *entries,
const gchar *translation_domain)
{
g_return_if_fail (context != NULL);
g_return_if_fail (entries != NULL);
if (!context->main_group)
@ -841,6 +842,8 @@ g_option_context_get_help (GOptionContext *context,
GString *string;
guchar token;
g_return_val_if_fail (context != NULL, NULL);
string = g_string_sized_new (1024);
rest_description = NULL;
@ -1958,6 +1961,8 @@ g_option_context_parse (GOptionContext *context,
gint i, j, k;
GList *list;
g_return_val_if_fail (context != NULL, FALSE);
/* Set program name */
if (!g_get_prgname())
{
@ -2405,6 +2410,7 @@ g_option_group_add_entries (GOptionGroup *group,
{
gsize i, n_entries;
g_return_if_fail (group != NULL);
g_return_if_fail (entries != NULL);
for (n_entries = 0; entries[n_entries].long_name != NULL; n_entries++) ;
@ -2745,6 +2751,8 @@ g_option_context_parse_strv (GOptionContext *context,
gboolean success;
gint argc;
g_return_val_if_fail (context != NULL, FALSE);
context->strv_mode = TRUE;
argc = arguments && *arguments ? g_strv_length (*arguments) : 0;
success = g_option_context_parse (context, &argc, arguments, error);