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

merge conflict

Browse Source
This commit is contained in:
Andrea Fioraldi
2020-10-28 14:36:49 +01:00
parent 868cb61ea6 fe705bb956
commit 93c9093817
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -1124,3 +1124,4 @@ Questions? Concerns? Bug reports? The contributors can be reached via
There is also a mailing list for the afl/afl++ project; to join, send a mail to There is also a mailing list for the afl/afl++ project; to join, send a mail to
<afl-users+subscribe@googlegroups.com>. Or, if you prefer to browse archives <afl-users+subscribe@googlegroups.com>. Or, if you prefer to browse archives
first, try: [https://groups.google.com/group/afl-users](https://groups.google.com/group/afl-users) first, try: [https://groups.google.com/group/afl-users](https://groups.google.com/group/afl-users)

12
src/afl-fuzz-one.c
View File

@ -1840,16 +1840,22 @@ havoc_stage:
u32 r_max, r; u32 r_max, r;
r_max = 15 + ((afl->extras_cnt + afl->a_extras_cnt) ? 2 : 0);
if (unlikely(afl->expand_havoc && afl->ready_for_splicing_count > 1)) { if (unlikely(afl->expand_havoc && afl->ready_for_splicing_count > 1)) {
/* add expensive havoc cases here, they are activated after a full /* add expensive havoc cases here, they are activated after a full
cycle without finds happened */ cycle without finds happened */
r_max = 16 + ((afl->extras_cnt + afl->a_extras_cnt) ? 2 : 0); r_max += 1;
} else { }
if (unlikely(get_cur_time() - afl->last_path_time > 5000)) {
r_max = 15 + ((afl->extras_cnt + afl->a_extras_cnt) ? 2 : 0); /* add expensive havoc cases here if there is no findings in the last 5s */
r_max += 1;
} }