diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-20 06:14:54 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-20 06:14:54 +0100 |
| commit | 87775e053d9f78506d8b4d3904c5f824c908389e (patch) | |
| tree | 027c5a2496c7306f0445942537fe70faf52fa785 /contributed | |
| parent | 2f7903e9688734698615db5889efa21ffaf59c4d (diff) | |
| parent | 10abcf77cc24dfae451d96310b4391dad35906ed (diff) | |
Update upstream source from tag 'upstream/6.8.1'
Update to upstream version '6.8.1'
with Debian dir 4321ce29f0c752eb322b128cd10520c8d9a87991
Diffstat (limited to 'contributed')
| -rw-r--r-- | contributed/libfuzzer-onig.cpp | 18 | ||||
| -rw-r--r-- | contributed/makefile | 22 |
2 files changed, 37 insertions, 3 deletions
diff --git a/contributed/libfuzzer-onig.cpp b/contributed/libfuzzer-onig.cpp index 984110d..dcd7c63 100644 --- a/contributed/libfuzzer-onig.cpp +++ b/contributed/libfuzzer-onig.cpp @@ -23,9 +23,21 @@ http://llvm.org/docs/LibFuzzer.html extern "C" int LLVMFuzzerTestOneInput(const uint8_t * Data, size_t Size) { regex_t *reg; - if (onig_new - (®, Data, Data + Size, ONIG_OPTION_DEFAULT, ONIG_ENCODING_UTF8, - ONIG_SYNTAX_DEFAULT, 0) == 0) + OnigEncoding enc; + + enc = ONIG_ENCODING_UTF8; + +#ifdef FULL_TEST + onig_initialize(&enc, 1); +#endif + + if (onig_new(®, Data, Data + Size, ONIG_OPTION_DEFAULT, enc, + ONIG_SYNTAX_DEFAULT, 0) == 0) onig_free(reg); + +#ifdef FULL_TEST + onig_end(); +#endif + return 0; } diff --git a/contributed/makefile b/contributed/makefile new file mode 100644 index 0000000..c50ab36 --- /dev/null +++ b/contributed/makefile @@ -0,0 +1,22 @@ + +ONIG_LIB=../src/.libs/libonig.a +LIBS=$(ONIG_LIB) /usr/local/lib/libLLVMFuzzerMain.a + +TARGETS=libfuzzer-onig libfuzzer-onig-full + +default: $(TARGETS) + +libfuzzer-onig: libfuzzer-onig.cpp $(ONIG_LIB) + clang++ $< $(LIBS) -o $@ -fsanitize-coverage=trace-pc-guard -fsanitize=fuzzer,address + +libfuzzer-onig-full: libfuzzer-onig.cpp $(ONIG_LIB) + clang++ -DFULL_TEST $< $(LIBS) -o $@ -fsanitize-coverage=trace-pc-guard -fsanitize=fuzzer,address + + +$(ONIG_LIB): + cd ..; ./configure CC=clang LD=clang CFLAGS="-g -fsanitize=fuzzer,address" LDFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=fuzzer,address"; make + + + +clean: + rm -f $(TARGETS) |