| indygreg |
| hg-reviewers |
Recent xdiff code cleanups removed some files and changed some structures.
Update fuzz code.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| $$CXX $$CXXFLAGS -std=c++11 -I../../mercurial bdiff.cc \ | $$CXX $$CXXFLAGS -std=c++11 -I../../mercurial bdiff.cc \ | ||||
| bdiff-oss-fuzz.o -lFuzzingEngine -o $$OUT/bdiff_fuzzer | bdiff-oss-fuzz.o -lFuzzingEngine -o $$OUT/bdiff_fuzzer | ||||
| x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h | x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h | ||||
| clang -g -O1 -fsanitize=fuzzer-no-link,address -c \ | clang -g -O1 -fsanitize=fuzzer-no-link,address -c \ | ||||
| -o $@ \ | -o $@ \ | ||||
| $< | $< | ||||
| xdiff: xdiff.cc xdiffi.o xemit.o xmerge.o xprepare.o xutils.o | xdiff: xdiff.cc xdiffi.o xprepare.o xutils.o | ||||
| clang -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \ | clang -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \ | ||||
| -I../../mercurial xdiff.cc \ | -I../../mercurial xdiff.cc \ | ||||
| xdiffi.o xemit.o xmerge.o xprepare.o xutils.o -o xdiff | xdiffi.o xprepare.o xutils.o -o xdiff | ||||
| fuzz-x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h | fuzz-x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h | ||||
| $$CC $$CFLAGS -c \ | $$CC $$CFLAGS -c \ | ||||
| -o $@ \ | -o $@ \ | ||||
| $< | $< | ||||
| xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xemit.o fuzz-xmerge.o fuzz-xprepare.o fuzz-xutils.o | xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o | ||||
| $$CXX $$CXXFLAGS -std=c++11 -I../../mercurial xdiff.cc \ | $$CXX $$CXXFLAGS -std=c++11 -I../../mercurial xdiff.cc \ | ||||
| fuzz-xdiffi.o fuzz-xemit.o fuzz-xmerge.o fuzz-xprepare.o fuzz-xutils.o \ | fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o \ | ||||
| -lFuzzingEngine -o $$OUT/xdiff_fuzzer | -lFuzzingEngine -o $$OUT/xdiff_fuzzer | ||||
| all: bdiff xdiff | all: bdiff xdiff | ||||
| oss-fuzz: bdiff_fuzzer xdiff_fuzzer | oss-fuzz: bdiff_fuzzer xdiff_fuzzer | ||||
| .PHONY: all oss-fuzz | .PHONY: all oss-fuzz | ||||
| a.ptr = (char *)Data + 1; | a.ptr = (char *)Data + 1; | ||||
| // which has len split-1 | // which has len split-1 | ||||
| a.size = split - 1; | a.size = split - 1; | ||||
| // `b` starts at the next byte after `a` ends | // `b` starts at the next byte after `a` ends | ||||
| b.ptr = a.ptr + a.size; | b.ptr = a.ptr + a.size; | ||||
| b.size = Size - split; | b.size = Size - split; | ||||
| xpparam_t xpp = { | xpparam_t xpp = { | ||||
| XDF_INDENT_HEURISTIC, /* flags */ | XDF_INDENT_HEURISTIC, /* flags */ | ||||
| NULL, /* anchors */ | |||||
| 0, /* anchors_nr */ | |||||
| }; | }; | ||||
| xdemitconf_t xecfg = { | xdemitconf_t xecfg = { | ||||
| 0, /* ctxlen */ | |||||
| 0, /* interhunkctxlen */ | |||||
| XDL_EMIT_BDIFFHUNK, /* flags */ | XDL_EMIT_BDIFFHUNK, /* flags */ | ||||
| NULL, /* find_func */ | |||||
| NULL, /* find_func_priv */ | |||||
| hunk_consumer, /* hunk_consume_func */ | hunk_consumer, /* hunk_consume_func */ | ||||
| }; | }; | ||||
| xdemitcb_t ecb = { | xdemitcb_t ecb = { | ||||
| NULL, /* priv */ | NULL, /* priv */ | ||||
| NULL, /* outf */ | |||||
| }; | }; | ||||
| xdl_diff(&a, &b, &xpp, &xecfg, &ecb); | xdl_diff(&a, &b, &xpp, &xecfg, &ecb); | ||||
| return 0; // Non-zero return values are reserved for future use. | return 0; // Non-zero return values are reserved for future use. | ||||
| } | } | ||||
| #ifdef HG_FUZZER_INCLUDE_MAIN | #ifdef HG_FUZZER_INCLUDE_MAIN | ||||
| int main(int argc, char **argv) | int main(int argc, char **argv) | ||||
| { | { | ||||
| const char data[] = "asdf"; | const char data[] = "asdf"; | ||||
| return LLVMFuzzerTestOneInput((const uint8_t *)data, 4); | return LLVMFuzzerTestOneInput((const uint8_t *)data, 4); | ||||
| } | } | ||||
| #endif | #endif | ||||
| } // extern "C" | } // extern "C" | ||||