Merge branch 'AFLplusplus:dev' into dev

This commit is contained in:
Yiyi Wang 2024-08-05 22:21:52 +08:00 committed by GitHub
commit b928303dd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions

View File

@ -878,7 +878,6 @@ void instrument_coverage_unstable_find_output(void) {
g_dir_close(dir);
g_free(instance_name);
g_free(path_tmp);
g_free(fds_name);
if (unstable_coverage_fuzzer_stats == NULL) {

View File

@ -108,7 +108,7 @@ void set_sanitizer_defaults() {
if (!have_san_options) { strcpy(buf, default_options); }
if (have_asan_options) {
if (NULL != strstr(have_asan_options, "detect_leaks=0")) {
if (NULL != strstr(have_asan_options, "detect_leaks=0") || NULL != strstr(have_asan_options, "detect_leaks=false")) {
strcat(buf, "exitcode=" STRINGIFY(LSAN_ERROR) ":fast_unwind_on_malloc=0:print_suppressions=0:detect_leaks=0:malloc_context_size=0:");

View File

@ -476,6 +476,17 @@ void mark_as_redundant(afl_state_t *afl, struct queue_entry *q, u8 state) {
q->fs_redundant = state;
if (likely(q->fs_redundant)) {
if (unlikely(q->trace_mini)) {
ck_free(q->trace_mini);
q->trace_mini = NULL;
}
}
sprintf(fn, "%s/queue/.state/redundant_edges/%s", afl->out_dir,
strrchr((char *)q->fname, '/') + 1);
@ -901,7 +912,7 @@ void update_bitmap_score(afl_state_t *afl, struct queue_entry *q) {
if (!--afl->top_rated[i]->tc_ref) {
ck_free(afl->top_rated[i]->trace_mini);
afl->top_rated[i]->trace_mini = 0;
afl->top_rated[i]->trace_mini = NULL;
}