зеркало из https://github.com/microsoft/git.git
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: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
c2df7585ef
Коммит
a961d1f1ea
|
@ -1,7 +1,7 @@
|
|||
#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);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче