From 246959346f3407cb047c3d46ed9c44da84bd0b29 Mon Sep 17 00:00:00 2001 From: Jinoh Kang Date: Fri, 6 Nov 2020 17:14:52 +0000 Subject: diff: allow passing NULL to diff_free_filespec_data() Commit 3aef54e8b8 ("diff: munmap() file contents before running external diff") introduced calls to diff_free_filespec_data in run_external_diff, which may pass NULL pointers. Fix this and prevent any such bugs in the future by making `diff_free_filespec_data(NULL)` a no-op. Fixes: 3aef54e8b8 ("diff: munmap() file contents before running external diff") Signed-off-by: Jinoh Kang Signed-off-by: Junio C Hamano --- diff.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 2bb2f8f57e..ffdb08d5bf 100644 --- a/diff.c +++ b/diff.c @@ -4111,6 +4111,9 @@ void diff_free_filespec_blob(struct diff_filespec *s) void diff_free_filespec_data(struct diff_filespec *s) { + if (!s) + return; + diff_free_filespec_blob(s); FREE_AND_NULL(s->cnt_data); } -- cgit v1.2.3