Commit a961d1f1 authored by René Scharfe's avatar René Scharfe Committed by Junio C Hamano

test-subprocess: fix segfault without arguments

Check if we even have a parameter before checking its value.  Running
this command without any arguments may not make a lot of sense, but
reacting with a segmentation fault is unduly harsh.

While we're at it, avoid casting argv by declaring it const right away.
Signed-off-by: default avatarRene Scharfe <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent c2df7585
#include "cache.h"
#include "run-command.h"
int main(int argc, char **argv)
int main(int argc, const char **argv)
{
struct child_process cp;
int nogit = 0;
......@@ -9,12 +9,12 @@ int main(int argc, char **argv)
setup_git_directory_gently(&nogit);
if (nogit)
die("No git repo found");
if (!strcmp(argv[1], "--setup-work-tree")) {
if (argc > 1 && !strcmp(argv[1], "--setup-work-tree")) {
setup_work_tree();
argv++;
}
memset(&cp, 0, sizeof(cp));
cp.git_cmd = 1;
cp.argv = (const char **)argv+1;
cp.argv = argv + 1;
return run_command(&cp);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment