Merge pull request #2026 from choller/pcmap_fix2

Fix delayed pcmap writing for code coverage with pc-table
This commit is contained in:
van Hauser 2024-03-06 17:56:24 +07:00 committed by GitHub
commit 092260e9f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1617,7 +1617,7 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg,
}
if (pc_filter) {
if (pc_filter && !mod_info->next) {
char PcDescr[1024];
// This function is a part of the sanitizer run-time.
@ -1644,7 +1644,8 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg,
}
if (__afl_filter_pcs && strstr(mod_info->name, __afl_filter_pcs_module)) {
if (__afl_filter_pcs && !mod_info->next &&
strstr(mod_info->name, __afl_filter_pcs_module)) {
u32 result_index;
if (locate_in_pcs(PC, &result_index)) {
@ -1669,7 +1670,7 @@ void __sanitizer_cov_pcs_init(const uintptr_t *pcs_beg,
}
mod_info->mapped = 1;
if (__afl_pcmap_ptr) { mod_info->mapped = 1; }
if (__afl_debug) {