SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix on_remove of MinimizerScheduler (#1161)

Browse Source 
* Fix cursor not step

* Update ref_cnt after remove

---------

Co-authored-by: Dongjia "toka" Zhang <tokazerkje@outlook.com>
Co-authored-by: Dominik Maier <domenukk@gmail.com>
This commit is contained in:
Elsa Granger 2023-04-08 22:58:25 +08:00 committed by GitHub
parent b519d24981
commit 21ee8d2cae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libafl/src/schedulers/minimizer.rs
View File

@ -140,6 +140,8 @@ where
}
})
.or_insert((factor, i));
entry = e_iter.next();
map_entry = map_iter.next();
}
Ordering::Greater => {
map_entry = map_iter.next();
@ -151,9 +153,30 @@ where
}
}
}
if let Some(meta) = state.metadata_map_mut().get_mut::<TopRatedsMetadata>() {
meta.map
.extend(map.into_iter().map(|(entry, (_, idx))| (entry, idx)));
if let Some(mut meta) = state.metadata_map_mut().remove::<TopRatedsMetadata>() {
let map_iter = map.iter();
let reserve = if meta.map.is_empty() {
map_iter.size_hint().0
} else {
(map_iter.size_hint().0 + 1) / 2
};
meta.map.reserve(reserve);
for (entry, (_, new_idx)) in map_iter {
let mut new = state.corpus().get(*new_idx)?.borrow_mut();
let new_meta = new.metadata_map_mut().get_mut::<M>().ok_or_else(|| {
Error::key_not_found(format!(
"{} needed for MinimizerScheduler not found in testcase #{new_idx}",
type_name::<M>()
))
})?;
*new_meta.refcnt_mut() += 1;
meta.map.insert(*entry, *new_idx);
}
// Put back the metadata
state.metadata_map_mut().insert_boxed(meta);
}
Ok(())
}