aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-08-11 18:06:18 +0200
committervan Hauser <vh@thc.org>2020-08-11 18:06:18 +0200
commitb604f5eafcebb816026e198df0ea66ebcbf18421 (patch)
treec407463af5dcfe5e031c33036a15a87e7a0be634 /src
parent220dc4a43d197f5ff451627a9923b874805c02aa (diff)
downloadafl++-b604f5eafcebb816026e198df0ea66ebcbf18421.tar.gz
finalize first beta! yay!
Diffstat (limited to 'src')
-rw-r--r--src/afl-fuzz-init.c9
-rw-r--r--src/afl-fuzz-one.c2
-rw-r--r--src/afl-fuzz-queue.c2
3 files changed, 9 insertions, 4 deletions
diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c
index 0150e18a..359eef85 100644
--- a/src/afl-fuzz-init.c
+++ b/src/afl-fuzz-init.c
@@ -771,9 +771,13 @@ void perform_dry_run(afl_state_t *afl) {
close(fd);
res = calibrate_case(afl, q, use_mem, 0, 1);
- ck_free(use_mem);
- if (afl->stop_soon) { return; }
+ if (afl->stop_soon) {
+
+ ck_free(use_mem);
+ return;
+
+ }
if (res == afl->crash_mode || res == FSRV_RUN_NOBITS) {
@@ -962,6 +966,7 @@ void perform_dry_run(afl_state_t *afl) {
/* perform taint gathering on the input seed */
if (afl->taint_mode) perform_taint_run(afl, q, q->fname, use_mem, q->len);
+ ck_free(use_mem);
q = q->next;
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c
index 7718256f..4db6febf 100644
--- a/src/afl-fuzz-one.c
+++ b/src/afl-fuzz-one.c
@@ -2342,7 +2342,7 @@ havoc_stage:
}
/* Tail */
- memcpy(new_buf + clone_to + clone_len, out_buf + clone_to,
+ memmove(new_buf + clone_to + clone_len, out_buf + clone_to,
temp_len - clone_to);
swap_bufs(BUF_PARAMS(out), BUF_PARAMS(out_scratch));
diff --git a/src/afl-fuzz-queue.c b/src/afl-fuzz-queue.c
index a1fe146b..43794018 100644
--- a/src/afl-fuzz-queue.c
+++ b/src/afl-fuzz-queue.c
@@ -122,7 +122,7 @@ void perform_taint_run(afl_state_t *afl, struct queue_entry *q, u8 *fname,
afl->taint_fsrv.map_size = plen; // speed :)
write_to_testcase(afl, mem, len);
- if (afl_fsrv_run_target(&afl->taint_fsrv, afl->fsrv.exec_tmout,
+ if (afl_fsrv_run_target(&afl->taint_fsrv, afl->fsrv.exec_tmout * 4,
&afl->stop_soon) == 0) {
bytes = q->taint_bytes_all =