luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-12-06 08:34:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

tools: Fix handling of empty argv in various minor GLib tools

Browse Source 
This won’t really affect anything, but we might as well fix them to not
crash if called with an empty `argv` by someone (ab)using `execve()`.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall
2022-01-31 14:47:57 +00:00
parent 0d743e7ffb
commit 3ea4ba31a1
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gdbus-tool.c
View File

@@ -107,7 +107,7 @@ usage (gint *argc, gchar **argv[], gboolean use_stdout)
g_option_context_set_help_enabled (o, FALSE); g_option_context_set_help_enabled (o, FALSE);
/* Ignore parsing result */ /* Ignore parsing result */
g_option_context_parse (o, argc, argv, NULL); g_option_context_parse (o, argc, argv, NULL);
program_name = g_path_get_basename ((*argv)[0]); program_name = (*argc > 0) ? g_path_get_basename ((*argv)[0]) : g_strdup ("gdbus-tool");
s = g_strdup_printf (_("Commands:\n" s = g_strdup_printf (_("Commands:\n"
" help Shows this information\n" " help Shows this information\n"
" introspect Introspect a remote object\n" " introspect Introspect a remote object\n"
@@ -141,6 +141,7 @@ modify_argv0_for_command (gint *argc, gchar **argv[], const gchar *command)
* 2. save old argv[0] and restore later * 2. save old argv[0] and restore later
*/ */
g_assert (*argc > 1);
g_assert (g_strcmp0 ((*argv)[1], command) == 0); g_assert (g_strcmp0 ((*argv)[1], command) == 0);
remove_arg (1, argc, argv); remove_arg (1, argc, argv);

2
gio/gio-querymodules.c
View File

@@ -161,7 +161,7 @@ main (gint argc,
{ {
int i; int i;
if (argc == 1) if (argc <= 1)
{ {
g_print ("Usage: gio-querymodules <directory1> [<directory2> ...]\n"); g_print ("Usage: gio-querymodules <directory1> [<directory2> ...]\n");
g_print ("Will update giomodule.cache in the listed directories\n"); g_print ("Will update giomodule.cache in the listed directories\n");

3
glib/deprecated/gcompletion.c
View File

@@ -463,7 +463,8 @@ main (int argc,
if (argc < 3) if (argc < 3)
{ {
g_warning ("Usage: %s filename prefix1 [prefix2 ...]", argv[0]); g_warning ("Usage: %s filename prefix1 [prefix2 ...]",
(argc > 0) ? argv[0] : "gcompletion");
return 1; return 1;
} }

3
glib/win_iconv.c
View File

@@ -2034,7 +2034,8 @@ main(int argc, char **argv)
if (fromcode == NULL || tocode == NULL) if (fromcode == NULL || tocode == NULL)
{ {
printf("usage: %s [-c] -f from-enc -t to-enc [file]\n", argv[0]); printf("usage: %s [-c] -f from-enc -t to-enc [file]\n",
(argc > 0) ? argv[0] : "win_iconv");
return 0; return 0;
} }

2
gobject/gobject-query.c
View File

@@ -196,7 +196,7 @@ main (gint argc,
} }
if (!gen_froots && !gen_tree) if (!gen_froots && !gen_tree)
return help (argv[i-1]); return help ((argc > 0) ? argv[i-1] : NULL);
if (!indent_inc) if (!indent_inc)
{ {