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

changed run_target

Browse Source
This commit is contained in:
Dominik Maier
2020-04-15 19:23:26 +02:00
parent 48f7f7a17b
commit 0c02a8f4d3
8 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/afl-tmin.c
View File

@ -100,8 +100,29 @@ static const u8 count_class_lookup[256] = {
};
static void classify_counts(u8 *mem) {
/* Apply mask to classified bitmap (if set). */
static void apply_mask(u32 *mem, u32 *mask) {
u32 i = (MAP_SIZE >> 2);
if (!mask) return;
while (i--) {
*mem &= ~*mask;
mem++;
mask++;
}
}
static void classify_counts(afl_forkserver_t *fsrv) {
if (hang_mode) return; /* We only want hangs */
u8 *mem = fsrv->trace_bits;
u32 i = MAP_SIZE;
if (edges_only) {
@ -124,23 +145,7 @@ static void classify_counts(u8 *mem) {
}
}
/* Apply mask to classified bitmap (if set). */
static void apply_mask(u32 *mem, u32 *mask) {
u32 i = (MAP_SIZE >> 2);
if (!mask) return;
while (i--) {
*mem &= ~*mask;
mem++;
mask++;
}
apply_mask((u32 *)fsrv->trace_bits, (u32 *)mask_bitmap);
}
@ -250,17 +255,11 @@ static u8 run_target(afl_forkserver_t *fsrv, char **argv, u8 *mem, u32 len,
write_to_testcase(fsrv, mem, len);
fsrv_run_result_t ret = afl_fsrv_run_target(fsrv, &stop_soon);
fsrv_run_result_t ret =
afl_fsrv_run_target(fsrv, fsrv->exec_tmout, classify_counts, &stop_soon);
if (ret == FSRV_RUN_ERROR) FATAL("Couldn't run child");
if (!hang_mode) {
classify_counts(fsrv->trace_bits);
apply_mask((u32 *)fsrv->trace_bits, (u32 *)mask_bitmap);
}
if (stop_soon) {
SAYF(cRST cLRD "\n+++ Minimization aborted by user +++\n" cRST);