summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-05 22:26:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-05 22:26:11 (GMT)
commit19a504d92bde1ba1936eb025c571fef7e6630e4b (patch)
tree2b00135c87360ebc06849766eda52d9b75b16290 /Makefile
parent40b8ba2c4458bd1ed6d32092712c07a4fc26e256 (diff)
parent8b7c2eee7d2e6470a6d5484614e491d4a4571d09 (diff)
downloadgit-19a504d92bde1ba1936eb025c571fef7e6630e4b.zip
git-19a504d92bde1ba1936eb025c571fef7e6630e4b.tar.gz
git-19a504d92bde1ba1936eb025c571fef7e6630e4b.tar.bz2
Merge branch 'js/commit-graph-chunk-table-fix'
The codepath to read from the commit-graph file attempted to read past the end of it when the file's table-of-contents was corrupt. * js/commit-graph-chunk-table-fix: Makefile: correct example fuzz build commit-graph: fix buffer read-overflow commit-graph, fuzz: add fuzzer for commit-graph
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6e8d017..28ee179 100644
--- a/Makefile
+++ b/Makefile
@@ -690,6 +690,7 @@ SCRIPTS = $(SCRIPT_SH_INS) \
ETAGS_TARGET = TAGS
+FUZZ_OBJS += fuzz-commit-graph.o
FUZZ_OBJS += fuzz-pack-headers.o
FUZZ_OBJS += fuzz-pack-idx.o
@@ -3125,7 +3126,7 @@ cover_db_html: cover_db
# An example command to build against libFuzzer from LLVM 4.0.0:
#
# make CC=clang CXX=clang++ \
-# FUZZ_CXXFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=address" \
+# CFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=address" \
# LIB_FUZZING_ENGINE=/usr/lib/llvm-4.0/lib/libFuzzer.a \
# fuzz-all
#