diff options
author | Jinoh Kang <luke1337@theori.io> | 2020-11-06 20:14:52 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-06 22:37:07 +0300 |
commit | 246959346f3407cb047c3d46ed9c44da84bd0b29 (patch) | |
tree | 60f01c3e43913becdafbffe2b7df9c850b58e368 /diff.c | |
parent | 898f80736c75878acc02dc55672317fcc0e0a5a6 (diff) |
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 <luke1337@theori.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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); } |