@matheusbsbs / matheus-bagliano / commits / f44213258d
Fork 0

git-blame: prevent argument parsing segfault

The 3rd branch in builtin-blame.c should also check for lacking arguments. Running that in top dir does not trigger the problem because the 'prefix' is NULL. Signed-off-by: Tommi Kyntola <tommi.kyntola@ray.fi> Signed-off-by: Junio C Hamano <junkio@cox.net>

Tommi Kyntola committed Feb 16, 2007 at 10:50 UTC f44213258de3fbef932f9c655213202f69dccc80
1 file changed +3
builtin-blame.c
+3
@@ -2200,6 +2200,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
2200 if (!strcmp(argv[j], "--"))
2201 seen_dashdash = j;
2202 if (seen_dashdash) {
2203 + /* (2) */
2204 if (seen_dashdash + 1 != argc - 1)
2205 usage(blame_usage);
2206 path = add_prefix(prefix, argv[seen_dashdash + 1]);
@@ -2208,6 +2209,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
2209 }
2210 else {
2211 /* (3) */
2212 + if (argc <= i)
2213 + usage(blame_usage);
2214 path = add_prefix(prefix, argv[i]);
2215 if (i + 1 == argc - 1) {
2216 final_commit_name = argv[i + 1];