aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarc <marc@marc.srlabs.de>2023-08-09 17:14:13 +0200
committermarc <marc@marc.srlabs.de>2023-08-09 17:14:13 +0200
commit55d696fbae435e0e69adf75cb2df1361186fb999 (patch)
treef39de203508117dcb50b66baa8fd335a887a9c54
parentb4bd33961c645b1fed059d5ff8269911bc941cc9 (diff)
downloadafl++-55d696fbae435e0e69adf75cb2df1361186fb999.tar.gz
code format
-rw-r--r--include/afl-fuzz.h4
-rw-r--r--src/afl-fuzz-init.c42
-rw-r--r--src/afl-fuzz-redqueen.c2
-rw-r--r--src/afl-fuzz.c2
4 files changed, 28 insertions, 22 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 18352acb..ef84a18c 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -402,14 +402,14 @@ typedef struct afl_env_vars {
afl_exit_on_seed_issues, afl_try_affinity, afl_ignore_problems,
afl_keep_timeouts, afl_no_crash_readme, afl_ignore_timeouts,
afl_no_startup_calibration, afl_no_warn_instability,
- afl_post_process_keep_original;
+ afl_post_process_keep_original, afl_crashing_seeds_as_new_crash;
u8 *afl_tmpdir, *afl_custom_mutator_library, *afl_python_module, *afl_path,
*afl_hang_tmout, *afl_forksrv_init_tmout, *afl_preload,
*afl_max_det_extras, *afl_statsd_host, *afl_statsd_port,
*afl_crash_exitcode, *afl_statsd_tags_flavor, *afl_testcache_size,
*afl_testcache_entries, *afl_child_kill_signal, *afl_fsrv_kill_signal,
- *afl_target_env, *afl_persistent_record, *afl_exit_on_time, *afl_crashing_seeds_as_new_crash;
+ *afl_target_env, *afl_persistent_record, *afl_exit_on_time;
s32 afl_pizza_mode;
diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c
index d994d749..5a530821 100644
--- a/src/afl-fuzz-init.c
+++ b/src/afl-fuzz-init.c
@@ -1057,18 +1057,21 @@ void perform_dry_run(afl_state_t *afl) {
fn, (int)(s8)afl->fsrv.crash_exitcode);
} else {
+
if (afl->afl_env.afl_crashing_seeds_as_new_crash) {
-
+
WARNF(
"Test case '%s' results in a crash, "
"as AFL_CRASHING_SEEDS_AS_NEW_CRASH is set, "
- "saving as a new crash", fn);
-
+ "saving as a new crash",
+ fn);
+
} else {
WARNF("Test case '%s' results in a crash, skipping", fn);
-
+
}
+
}
if (afl->afl_env.afl_exit_on_seed_issues) {
@@ -1089,20 +1092,19 @@ void perform_dry_run(afl_state_t *afl) {
/* Crashing seeds will be regarded as new crashes on startup */
if (afl->afl_env.afl_crashing_seeds_as_new_crash) {
-
+
++afl->total_crashes;
if (likely(!afl->non_instrumented_mode)) {
classify_counts(&afl->fsrv);
-
+
simplify_trace(afl, afl->fsrv.trace_bits);
if (!has_new_bits(afl, afl->virgin_crash)) { break; }
}
-
if (unlikely(!afl->saved_crashes) &&
(afl->afl_env.afl_no_crash_readme != 1)) {
@@ -1116,18 +1118,22 @@ void perform_dry_run(afl_state_t *afl) {
afl->stage_name = "dry_run";
afl->stage_short = "dry_run";
- #ifndef SIMPLE_FILES
+#ifndef SIMPLE_FILES
- snprintf(crash_fn, PATH_MAX, "%s/crashes/id:%06llu,sig:%02u,%s%s", afl->out_dir,
- afl->saved_crashes, afl->fsrv.last_kill_signal,
- describe_op(afl, 0, NAME_MAX - strlen("id:000000,sig:00,") - strlen(use_name)), use_name);
+ snprintf(crash_fn, PATH_MAX, "%s/crashes/id:%06llu,sig:%02u,%s%s",
+ afl->out_dir, afl->saved_crashes, afl->fsrv.last_kill_signal,
+ describe_op(afl, 0,
+ NAME_MAX - strlen("id:000000,sig:00,") -
+ strlen(use_name)),
+ use_name);
- #else
+#else
- snprintf(crash_fn, PATH_MAX, "%s/crashes/id_%06llu_%02u", afl->out_dir,
- afl->saved_crashes, afl->fsrv.last_kill_signal);
+ snprintf(crash_fn, PATH_MAX, "%s/crashes/id_%06llu_%02u",
+ afl->out_dir, afl->saved_crashes,
+ afl->fsrv.last_kill_signal);
- #endif
+#endif
++afl->saved_crashes;
@@ -1169,12 +1175,12 @@ void perform_dry_run(afl_state_t *afl) {
}
}
-
+
q->disabled = 1;
q->perf_score = 0;
- break;
-
+ break;
+
case FSRV_RUN_ERROR:
FATAL("Unable to execute target application ('%s')", afl->argv[0]);
diff --git a/src/afl-fuzz-redqueen.c b/src/afl-fuzz-redqueen.c
index 509f66a3..db4991db 100644
--- a/src/afl-fuzz-redqueen.c
+++ b/src/afl-fuzz-redqueen.c
@@ -2525,7 +2525,7 @@ static u8 rtn_fuzz(afl_state_t *afl, u32 key, u8 *orig_buf, u8 *buf, u8 *cbuf,
*/
#ifdef _DEBUG
- u32 j;
+ u32 j;
struct cmp_header *hh = &afl->orig_cmp_map->headers[key];
fprintf(stderr, "RTN N hits=%u id=%u shape=%u attr=%u v0=", h->hits, h->id,
hshape, h->attribute);
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index 733c7429..cdb3f996 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -1592,7 +1592,7 @@ int main(int argc, char **argv_orig, char **envp) {
if (get_afl_env("AFL_NO_ARITH")) { afl->no_arith = 1; }
if (get_afl_env("AFL_SHUFFLE_QUEUE")) { afl->shuffle_queue = 1; }
if (get_afl_env("AFL_EXPAND_HAVOC_NOW")) { afl->expand_havoc = 1; }
-
+
if (afl->afl_env.afl_autoresume) {
afl->autoresume = 1;