diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 10:11:22 +0200 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 10:11:22 +0200 |
| commit | 982d46e7cb2c7cabcd8969e6303c3cb8f3d8e56a (patch) | |
| tree | f8768002211d8531c226adab51751be87c6f7bce /src/afl-fuzz.c | |
| parent | 5daec436f93240a0c411d432456f3f86fe1f3181 (diff) | |
| parent | 1fbface656ae4f64fc8643def840fa488098e580 (diff) | |
| download | afl++-982d46e7cb2c7cabcd8969e6303c3cb8f3d8e56a.tar.gz | |
solve conflicts
Diffstat (limited to 'src/afl-fuzz.c')
| -rw-r--r-- | src/afl-fuzz.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index 136a9519..2320be5a 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -984,12 +984,6 @@ int main(int argc, char **argv_orig, char **envp) { if (afl->cmplog_binary) { - if (afl->limit_time_sig) - FATAL( - "MOpt and CmpLog are mutually exclusive. We accept pull requests " - "that integrates MOpt with the optional mutators " - "(custom/radamsa/redquenn/...)."); - if (afl->unicorn_mode) FATAL("CmpLog and Unicorn mode are not compatible at the moment, sorry"); if (!afl->fsrv.qemu_mode) check_binary(afl, afl->cmplog_binary); |