From 8f6c191d6c6516612850f602bc6152506f8186d8 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Wed, 2 Sep 2015 23:27:39 +0000 Subject: [PATCH] [libFuzzer] deprecate the -tokens flag. This was a bad idea because the corpus with this flag contains encrypted inputs, not the real inputs, which complicates interoperation with other fuzzers. Instead we'll need to implement AFL dictionary support git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246734 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Fuzzer/FuzzerDriver.cpp | 2 +- lib/Fuzzer/FuzzerFlags.def | 5 +++-- lib/Fuzzer/test/fuzzer.test | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Fuzzer/FuzzerDriver.cpp b/lib/Fuzzer/FuzzerDriver.cpp index d94eb98a4da..610b3c9d07e 100644 --- a/lib/Fuzzer/FuzzerDriver.cpp +++ b/lib/Fuzzer/FuzzerDriver.cpp @@ -238,7 +238,7 @@ int FuzzerDriver(int argc, char **argv, UserSuppliedFuzzer &USF) { Options.UseFullCoverageSet = Flags.use_full_coverage_set; Options.PreferSmallDuringInitialShuffle = Flags.prefer_small_during_initial_shuffle; - Options.Tokens = ReadTokensFile(Flags.tokens); + Options.Tokens = ReadTokensFile(Flags.deprecated_tokens); Options.Reload = Flags.reload; Options.OnlyASCII = Flags.only_ascii; Options.TBMDepth = Flags.tbm_depth; diff --git a/lib/Fuzzer/FuzzerFlags.def b/lib/Fuzzer/FuzzerFlags.def index 7bc18af2248..534c867b8e2 100644 --- a/lib/Fuzzer/FuzzerFlags.def +++ b/lib/Fuzzer/FuzzerFlags.def @@ -50,8 +50,9 @@ FUZZER_FLAG_INT(workers, 0, FUZZER_FLAG_INT(reload, 1, "Reload the main corpus periodically to get new units" " discovered by other processes.") -FUZZER_FLAG_STRING(tokens, "Use the file with tokens (one token per line) to" - " fuzz a token based input language.") +FUZZER_FLAG_STRING(deprecated_tokens, + "Use the file with tokens (one token per line) to" + " fuzz a token based input language.") FUZZER_FLAG_STRING(apply_tokens, "Read the given input file, substitute bytes " " with tokens and write the result to stdout.") FUZZER_FLAG_STRING(sync_command, "Execute an external command " diff --git a/lib/Fuzzer/test/fuzzer.test b/lib/Fuzzer/test/fuzzer.test index 888e1460059..3b8cf09a9a9 100644 --- a/lib/Fuzzer/test/fuzzer.test +++ b/lib/Fuzzer/test/fuzzer.test @@ -21,7 +21,7 @@ RUN: not LLVMFuzzer-CounterTest -use_counters=1 -max_len=6 -seed=1 -timeout=15 2 RUN: not LLVMFuzzer-SimpleCmpTest -use_traces=1 -seed=1 -runs=1000000 -timeout=5 2>&1 | FileCheck %s -RUN: not LLVMFuzzer-CxxTokensTest -seed=1 -timeout=15 -tokens=%S/../cxx_fuzzer_tokens.txt 2>&1 | FileCheck %s +RUN: not LLVMFuzzer-CxxTokensTest -seed=1 -timeout=15 -deprecated_tokens=%S/../cxx_fuzzer_tokens.txt 2>&1 | FileCheck %s RUN: not LLVMFuzzer-UserSuppliedFuzzerTest -seed=1 -timeout=15 2>&1 | FileCheck %s -- 2.34.1