Skip to content

Commit a437f5b

Browse files
j6tttaylorr
authored andcommitted
git-gui: sanitize 'exec' arguments: convert new 'cygpath' calls
The side branch merged in the previous commit introduces new 'exec' calls. Convert these in the same way we did earlier for existing 'exec' calls. Signed-off-by: Johannes Sixt <[email protected]> Signed-off-by: Taylor Blau <[email protected]>
1 parent afca9a4 commit a437f5b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-gui.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ if {[string match @@* $_shellpath]} {
393393
}
394394
395395
if {[is_Windows]} {
396-
set _shellpath [exec cygpath -m $_shellpath]
396+
set _shellpath [safe_exec [list cygpath -m $_shellpath]]
397397
}
398398
399399
if {![file executable $_shellpath] || \
@@ -2778,7 +2778,7 @@ if {![is_bare]} {
27782778

27792779
if {[is_Windows]} {
27802780
# Use /git-bash.exe if available
2781-
set _git_bash [exec cygpath -m /git-bash.exe]
2781+
set _git_bash [safe_exec [list cygpath -m /git-bash.exe]]
27822782
if {[file executable $_git_bash]} {
27832783
set _bash_cmdline [list "Git Bash" $_git_bash]
27842784
} else {

0 commit comments

Comments
 (0)