callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 766327 - gimptool-2.0 not quoting filenames/directories

Browse Source 
Quote installation paths with g_shell_quote().

(cherry picked from commit c73104e3ea)
This commit is contained in:
Michael Natterer
2016-05-22 22:38:12 +02:00
parent 395f1ef953
commit c534a18d15
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/gimptool.c
View File

@ -476,7 +476,7 @@ do_build_2 (const gchar *cflags,
else else
q++; q++;
dest_exe = g_strconcat (q, EXEEXT, NULL); dest_exe = g_strconcat (dest_dir, q, EXEEXT, NULL);
if (msvc_syntax) if (msvc_syntax)
{ {
@ -492,19 +492,19 @@ do_build_2 (const gchar *cflags,
#endif #endif
} }
cmd = g_strdup_printf ("%s %s %s %s%s%s %s%s %s%s %s %s", cmd = g_strdup_printf ("%s %s %s %s%s %s%s %s%s %s %s",
env_cc, env_cc,
env_cflags, env_cflags,
cflags, cflags,
output_flag, output_flag,
dest_dir, g_shell_quote (dest_exe),
dest_exe,
what, what,
here_comes_linker_flags, here_comes_linker_flags,
env_ldflags, env_ldflags,
windows_subsystem_flag, windows_subsystem_flag,
libs, libs,
env_libs); env_libs);
maybe_run (cmd); maybe_run (cmd);
} }
@ -603,7 +603,10 @@ do_install_bin_2 (const gchar *dir,
S_IRGRP | S_IXGRP | S_IRGRP | S_IXGRP |
S_IROTH | S_IXOTH); S_IROTH | S_IXOTH);
maybe_run (g_strconcat (COPY, " ", what, " ", dir, NULL)); maybe_run (g_strconcat (COPY, " ",
g_shell_quote (what), " ",
g_shell_quote (dir),
NULL));
} }
static void static void
@ -622,7 +625,10 @@ static void
do_uninstall (const gchar *dir, do_uninstall (const gchar *dir,
const gchar *what) const gchar *what)
{ {
maybe_run (g_strconcat (REMOVE, " ", dir, G_DIR_SEPARATOR_S, what, NULL)); maybe_run (g_strconcat (REMOVE, " ",
g_shell_quote (g_strconcat (dir, G_DIR_SEPARATOR_S,
what, NULL)),
NULL));
} }
static const gchar * static const gchar *