luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-24 01:48:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: Add missing shell argument quoting in spawn-test

Browse Source 
It’s not currently needed, because the filename being passed to the
subprocess is hard-coded and doesn’t contain anything which would need
escaping. But the following commit is going to change that (to avoid
filename collisions), so let’s fix the quoting first.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall
2025-03-19 17:02:31 +00:00
parent a795dede46
commit e4fca24a06
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
glib/tests/spawn-test.c
View File

@@ -195,8 +195,11 @@ test_spawn_basics (void)
{
gboolean result;
GError *err = NULL;
const char *tmp_filename;
char *tmp_filename_quoted = NULL;
gchar *output = NULL;
gchar *erroutput = NULL;
char full_cmdline[1000] = {0};
#ifdef G_OS_WIN32
size_t n;
char buf[100];
@@ -205,7 +208,6 @@ test_spawn_basics (void)
gchar **envp = g_get_environ ();
gchar *system_directory;
gchar spawn_binary[1000] = {0};
gchar full_cmdline[1000] = {0};
GList *cmd_shell_env_vars = NULL;
const LCID old_lcid = GetThreadUILanguage ();
const unsigned int initial_cp = GetConsoleOutputCP ();
@@ -254,18 +256,20 @@ test_spawn_basics (void)
* important e.g for the MSYS2 environment, which provides coreutils
* sort.exe
*/
g_file_set_contents ("spawn-test-created-file.txt",
tmp_filename = "spawn-test-created-file.txt";
g_file_set_contents (tmp_filename,
"line first\nline 2\nline last\n", -1, &err);
g_assert_no_error(err);
tmp_filename_quoted = g_shell_quote (tmp_filename);
#ifndef G_OS_WIN32
result = g_spawn_command_line_sync ("sort spawn-test-created-file.txt",
&output, &erroutput, NULL, &err);
g_snprintf (full_cmdline, sizeof (full_cmdline),
"sort %s", tmp_filename_quoted);
#else
g_snprintf (full_cmdline, sizeof (full_cmdline),
"'%s\\sort.exe' spawn-test-created-file.txt", system_directory);
result = g_spawn_command_line_sync (full_cmdline, &output, &erroutput, NULL, &err);
"'%s\\sort.exe' %s", system_directory, tmp_filename_quoted);
#endif
result = g_spawn_command_line_sync (full_cmdline, &output, &erroutput, NULL, &err);
g_assert_no_error (err);
g_assert_true (result);
g_assert_nonnull (output);
@@ -305,7 +309,8 @@ test_spawn_basics (void)
#endif
g_free (erroutput);
erroutput = NULL;
g_unlink ("spawn-test-created-file.txt");
g_unlink (tmp_filename);
g_free (tmp_filename_quoted);
#ifdef G_OS_WIN32
g_test_message ("Running spawn-test-win32-gui in various ways.");