From 2ee4314bc955bb09e3bd6689a6cb60afe650ca08 Mon Sep 17 00:00:00 2001 From: Robert Maracine Date: Sat, 7 Mar 2020 11:29:54 +0200 Subject: [PATCH 1/2] Fix segmentation fault in git-help.c --- git-help.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/git-help.c b/git-help.c index 5cd7ab1..d7d3b42 100644 --- a/git-help.c +++ b/git-help.c @@ -27,13 +27,17 @@ int main(int argc, char **argv) if (argc == 1) system("man git"); else { +<<<<<<< Updated upstream cmd = malloc(9 + strlen(argv[argc])); +======= + cmd = malloc(7 + strlen(argv[argc-1])); +>>>>>>> Stashed changes if (!cmd) { fprintf(stderr, "not enought memory to create command!\n"); exit(-1); } strcpy(cmd, "man git-"); - strcat(cmd, argv[argc]); + strcat(cmd, argv[argc-1]); system(cmd); } From 36a0c6b7a0dad2d74dba2876ae891bc964ac7765 Mon Sep 17 00:00:00 2001 From: Robert Maracine Date: Sat, 7 Mar 2020 11:35:53 +0200 Subject: [PATCH 2/2] Fix segmentation fault in git-help.c --- git-help.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-help.c b/git-help.c index 3bbff26..26b6941 100644 --- a/git-help.c +++ b/git-help.c @@ -27,13 +27,13 @@ int main(int argc, char **argv) if (argc == 1) system("man git"); else { - cmd = malloc(7 + strlen(argv[argc])); + cmd = malloc(7 + strlen(argv[argc-1])); if (!cmd) { fprintf(stderr, "not enought memory to create command!\n"); exit(-1); } strcpy(cmd, "man git-"); - strcat(cmd, argv[argc]); + strcat(cmd, argv[argc-1]); system(cmd); }