This commit is contained in:
vanhauser-thc
2021-03-21 16:23:08 +01:00
parent 687dd9cb67
commit 84534ae2e8
4 changed files with 16 additions and 12 deletions

View File

@ -1256,6 +1256,7 @@ int main(int argc, char **argv, char **envp) {
} else if (strcasecmp(ptr, "LLVMNATIVE") == 0 || } else if (strcasecmp(ptr, "LLVMNATIVE") == 0 ||
strcasecmp(ptr, "NATIVE") == 0 ||
strcasecmp(ptr, "LLVM-NATIVE") == 0) { strcasecmp(ptr, "LLVM-NATIVE") == 0) {
compiler_mode = LLVM; compiler_mode = LLVM;
@ -1668,8 +1669,8 @@ int main(int argc, char **argv, char **envp) {
"of afl-cc.\n\n"); "of afl-cc.\n\n");
#if LLVM_MAJOR > 10 || (LLVM_MAJOR == 10 && LLVM_MINOR > 0) #if LLVM_MAJOR > 10 || (LLVM_MAJOR == 10 && LLVM_MINOR > 0)
#define NATIVE_MSG \ #define NATIVE_MSG \
" NATIVE: use llvm's native PCGUARD instrumentation (less " \ " LLVM-NATIVE: use llvm's native PCGUARD instrumentation (less " \
"performant)\n" "performant)\n"
#else #else
#define NATIVE_MSG "" #define NATIVE_MSG ""

View File

@ -2013,7 +2013,7 @@ void setup_dirs_fds(afl_state_t *afl) {
tmp = alloc_printf("%s/plot_data", afl->out_dir); tmp = alloc_printf("%s/plot_data", afl->out_dir);
if(!afl->in_place_resume) { if (!afl->in_place_resume) {
int fd = open(tmp, O_WRONLY | O_CREAT | O_EXCL, 0600); int fd = open(tmp, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0) { PFATAL("Unable to create '%s'", tmp); } if (fd < 0) { PFATAL("Unable to create '%s'", tmp); }
@ -2022,10 +2022,11 @@ void setup_dirs_fds(afl_state_t *afl) {
afl->fsrv.plot_file = fdopen(fd, "w"); afl->fsrv.plot_file = fdopen(fd, "w");
if (!afl->fsrv.plot_file) { PFATAL("fdopen() failed"); } if (!afl->fsrv.plot_file) { PFATAL("fdopen() failed"); }
fprintf(afl->fsrv.plot_file, fprintf(
"# unix_time, cycles_done, cur_path, paths_total, " afl->fsrv.plot_file,
"pending_total, pending_favs, map_size, unique_crashes, " "# unix_time, cycles_done, cur_path, paths_total, "
"unique_hangs, max_depth, execs_per_sec, total_execs, edges_found\n"); "pending_total, pending_favs, map_size, unique_crashes, "
"unique_hangs, max_depth, execs_per_sec, total_execs, edges_found\n");
} else { } else {

View File

@ -391,10 +391,11 @@ void maybe_update_plot_file(afl_state_t *afl, u32 t_bytes, double bitmap_cvg,
fprintf(afl->fsrv.plot_file, fprintf(afl->fsrv.plot_file,
"%llu, %llu, %u, %u, %u, %u, %0.02f%%, %llu, %llu, %u, %0.02f, %llu, " "%llu, %llu, %u, %u, %u, %u, %0.02f%%, %llu, %llu, %u, %0.02f, %llu, "
"%u\n", "%u\n",
(afl->prev_run_time + get_cur_time() - afl->start_time), afl->queue_cycle - 1, afl->current_entry, (afl->prev_run_time + get_cur_time() - afl->start_time),
afl->queued_paths, afl->pending_not_fuzzed, afl->pending_favored, afl->queue_cycle - 1, afl->current_entry, afl->queued_paths,
bitmap_cvg, afl->unique_crashes, afl->unique_hangs, afl->max_depth, afl->pending_not_fuzzed, afl->pending_favored, bitmap_cvg,
eps, afl->plot_prev_ed, t_bytes); /* ignore errors */ afl->unique_crashes, afl->unique_hangs, afl->max_depth, eps,
afl->plot_prev_ed, t_bytes); /* ignore errors */
fflush(afl->fsrv.plot_file); fflush(afl->fsrv.plot_file);

View File

@ -186,6 +186,7 @@ static int ExecuteFilesOnyByOne(int argc, char **argv) {
printf("Execution successful.\n"); printf("Execution successful.\n");
} }
close(fd); close(fd);
} }