From 3b0c18af5c545c93bf33b53d467b887e9733c0c6 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Fri, 9 Aug 2013 00:11:53 +0200 Subject: [PATCH] diff: fix a possible null pointer dereference The condition in the ternary operator was wrong, hence the wrong char pointer could be used as the parameter for show_submodule_summary. one->path may be null, but we definitely need a non null path given to the function. Signed-off-by: Stefan Beller Acked-By: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff.c b/diff.c index 80f8439441..061694b5ea 100644 --- a/diff.c +++ b/diff.c @@ -2252,7 +2252,7 @@ static void builtin_diff(const char *name_a, (!two->mode || S_ISGITLINK(two->mode))) { const char *del = diff_get_color_opt(o, DIFF_FILE_OLD); const char *add = diff_get_color_opt(o, DIFF_FILE_NEW); - show_submodule_summary(o->file, one ? one->path : two->path, + show_submodule_summary(o->file, one->path ? one->path : two->path, line_prefix, one->sha1, two->sha1, two->dirty_submodule, meta, del, add, reset); -- 2.11.4.GIT