ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-16 11:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

solve conflicts

Browse Source
This commit is contained in:
Andrea Fioraldi
2020-04-14 10:11:22 +02:00
parent 5daec436f9 1fbface656
commit 982d46e7cb
4 changed files with 76 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/afl-fuzz.c
View File

@ -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);