Skip to content

run-command: avoid NULL dereference for missing Windows shell #6358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
slix wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −0
Draft

run-command: avoid NULL dereference for missing Windows shell #6358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions run-command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ char *git_shell_path(void)
return xstrdup(SHELL_PATH);
#else
char *p = locate_in_PATH("sh");
if (!p)
die(_("cannot find 'sh' in PATH"));
convert_slashes(p);
return p;
#endif
Expand Down
12 changes: 12 additions & 0 deletions t/helper/test-run-command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ static int test_stdin_pipe_feed(int hook_stdin_fd, void *cb UNUSED, void *task_c
return !(*lines_remaining);
}

static int shell_path_without_path(void)
{
char *path;

unsetenv("PATH");
path = git_shell_path();
free(path);
return 0;
}

struct testsuite {
struct string_list tests, failed;
int next;
Expand Down Expand Up @@ -450,6 +460,8 @@ int cmd__run_command(int argc, const char **argv)

if (argc > 1 && !strcmp(argv[1], "testsuite"))
return testsuite(argc - 1, argv + 1);
if (argc > 1 && !strcmp(argv[1], "shell-path-without-path"))
return shell_path_without_path();
if (!strcmp(argv[1], "inherited-handle"))
return inherit_handle(argv[0]);
if (!strcmp(argv[1], "inherited-handle-child"))
Expand Down
5 changes: 5 additions & 0 deletions t/t0061-run-command.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ test_expect_success MINGW 'subprocess inherits only std handles' '
test-tool run-command inherited-handle
'

test_expect_success MINGW 'missing shell path is reported' '
test_must_fail test-tool run-command shell-path-without-path 2>err &&
test_grep "cannot find .sh. in PATH" err
'

test_expect_success 'start_command reports ENOENT (slash)' '
test-tool run-command start-command-ENOENT ./does-not-exist 2>err &&
test_grep "\./does-not-exist" err
Expand Down