ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-13 10:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix -E/-V

Browse Source
This commit is contained in:
van Hauser
2020-04-11 09:16:30 +02:00
parent d8947d1fa4
commit cc3ac932d9
2 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/afl-fuzz-stats.c
View File

@ -215,6 +215,28 @@ void show_stats(afl_state_t *afl) {
cur_ms = get_cur_time(); cur_ms = get_cur_time();
if (afl->most_time_key) {
if (afl->most_time * 1000 < cur_ms - afl->start_time) {
afl->most_time_key = 2;
afl->stop_soon = 2;
}
}
if (afl->most_execs_key == 1) {
if (afl->most_execs <= afl->total_execs) {
afl->most_execs_key = 2;
afl->stop_soon = 2;
}
}
/* If not enough time has passed since last UI update, bail out. */ /* If not enough time has passed since last UI update, bail out. */
if (cur_ms - afl->stats_last_ms < 1000 / UI_TARGET_HZ && if (cur_ms - afl->stats_last_ms < 1000 / UI_TARGET_HZ &&

36
src/afl-fuzz.c
View File

@ -129,12 +129,11 @@ static void usage(afl_state_t *afl, u8 *argv0, int more_help) {
"Testing settings:\n" "Testing settings:\n"
" -s seed - use a fixed seed for the RNG\n" " -s seed - use a fixed seed for the RNG\n"
" -V seconds - fuzz for a maximum total time of seconds then " " -V seconds - fuzz for a specific time then terminate\n"
" -E execs - fuzz for a approx. no of total executions then "
"terminate\n" "terminate\n"
" -E execs - fuzz for a maximum number of total executions then " " Note: not precise and can have several more "
"terminate\n" "executions.\n\n"
" Note: -V/-E are not precise, they are checked after a queue entry "
"is done\n which can be many minutes/execs later\n\n"
"Other stuff:\n" "Other stuff:\n"
" -T text - text banner to show on the screen\n" " -T text - text banner to show on the screen\n"
@ -144,7 +143,7 @@ static void usage(afl_state_t *afl, u8 *argv0, int more_help) {
" -B bitmap.txt - mutate a specific test case, use the out/fuzz_bitmap " " -B bitmap.txt - mutate a specific test case, use the out/fuzz_bitmap "
"file\n" "file\n"
" -C - crash exploration mode (the peruvian rabbit thing)\n" " -C - crash exploration mode (the peruvian rabbit thing)\n"
" -e ext - File extension for the temporarily generated test " " -e ext - file extension for the temporarily generated test "
"case\n\n", "case\n\n",
argv0, EXEC_TIMEOUT, MEM_LIMIT); argv0, EXEC_TIMEOUT, MEM_LIMIT);
@ -1122,31 +1121,6 @@ int main(int argc, char **argv_orig, char **envp) {
afl->queue_cur = afl->queue_cur->next; afl->queue_cur = afl->queue_cur->next;
++afl->current_entry; ++afl->current_entry;
if (afl->most_time_key == 1) {
u64 cur_ms_lv = get_cur_time();
if (afl->most_time * 1000 < cur_ms_lv - afl->start_time) {
afl->most_time_key = 2;
afl->stop_soon = 2;
break;
}
}
if (afl->most_execs_key == 1) {
if (afl->most_execs <= afl->total_execs) {
afl->most_execs_key = 2;
afl->stop_soon = 2;
break;
}
}
} }
// if (afl->queue_cur) show_stats(afl); // if (afl->queue_cur) show_stats(afl);