aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDominik Maier <domenukk@gmail.com>2020-04-16 14:47:08 +0200
committerDominik Maier <domenukk@gmail.com>2020-04-16 14:47:08 +0200
commit124665b392aa081807c8fa19948937a07de6053b (patch)
tree583773ff5a0089eb43da26a1232486013acaccbb /src
parentb420ccdbf8eba5875e5a0b6a6a9941564dee81bb (diff)
downloadafl++-124665b392aa081807c8fa19948937a07de6053b.tar.gz
code-format
Diffstat (limited to 'src')
-rw-r--r--src/afl-forkserver.c7
-rw-r--r--src/afl-fuzz-bitmap.c14
-rw-r--r--src/afl-fuzz-run.c2
-rw-r--r--src/afl-showmap.c8
-rw-r--r--src/afl-tmin.c3
5 files changed, 17 insertions, 17 deletions
diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c
index 5727c7f2..5cd000d7 100644
--- a/src/afl-forkserver.c
+++ b/src/afl-forkserver.c
@@ -408,11 +408,14 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv,
if ((status & FS_OPT_MAPSIZE) == FS_OPT_MAPSIZE) {
fsrv->map_size = FS_OPT_GET_MAPSIZE(status);
- if (unlikely(fsrv->map_size % 8)) {
+ if (unlikely(fsrv->map_size % 8)) {
+
// should not happen
WARNF("Target reported non-aligned map size of %ud", fsrv->map_size);
fsrv->map_size = (((fsrv->map_size + 8) >> 3) << 3);
+
}
+
if (!be_quiet) ACTF("Target map size: %u", fsrv->map_size);
if (fsrv->map_size > MAP_SIZE)
FATAL(
@@ -787,7 +790,7 @@ fsrv_run_result_t afl_fsrv_run_target(
behave very normally and do not have to be treated as volatile. */
MEM_BARRIER();
- //u32 tb4 = *(u32 *)fsrv->trace_bits;
+ // u32 tb4 = *(u32 *)fsrv->trace_bits;
if (likely(classify_counts_func)) classify_counts_func(fsrv);
diff --git a/src/afl-fuzz-bitmap.c b/src/afl-fuzz-bitmap.c
index 7be44fd5..92966c8c 100644
--- a/src/afl-fuzz-bitmap.c
+++ b/src/afl-fuzz-bitmap.c
@@ -112,18 +112,20 @@ u8 has_new_bits(afl_state_t *afl, u8 *virgin_map) {
#ifdef WORD_SIZE_64
- if (*virgin == 0xffffffffffffffff || (cur[0] && vir[0] == 0xff) || (cur[1] && vir[1] == 0xff) ||
- (cur[2] && vir[2] == 0xff) || (cur[3] && vir[3] == 0xff) ||
- (cur[4] && vir[4] == 0xff) || (cur[5] && vir[5] == 0xff) ||
- (cur[6] && vir[6] == 0xff) || (cur[7] && vir[7] == 0xff))
+ if (*virgin == 0xffffffffffffffff || (cur[0] && vir[0] == 0xff) ||
+ (cur[1] && vir[1] == 0xff) || (cur[2] && vir[2] == 0xff) ||
+ (cur[3] && vir[3] == 0xff) || (cur[4] && vir[4] == 0xff) ||
+ (cur[5] && vir[5] == 0xff) || (cur[6] && vir[6] == 0xff) ||
+ (cur[7] && vir[7] == 0xff))
ret = 2;
else
ret = 1;
#else
- if (*virgin == 0xffffffff || (cur[0] && vir[0] == 0xff) || (cur[1] && vir[1] == 0xff) ||
- (cur[2] && vir[2] == 0xff) || (cur[3] && vir[3] == 0xff))
+ if (*virgin == 0xffffffff || (cur[0] && vir[0] == 0xff) ||
+ (cur[1] && vir[1] == 0xff) || (cur[2] && vir[2] == 0xff) ||
+ (cur[3] && vir[3] == 0xff))
ret = 2;
else
ret = 1;
diff --git a/src/afl-fuzz-run.c b/src/afl-fuzz-run.c
index 4aec01f0..3933acd8 100644
--- a/src/afl-fuzz-run.c
+++ b/src/afl-fuzz-run.c
@@ -50,7 +50,7 @@ void write_to_testcase(afl_state_t *afl, void *mem, u32 len) {
s32 doc_fd;
char fn[PATH_MAX];
snprintf(fn, PATH_MAX, "%s/mutations/%09u:%s", afl->out_dir,
- afl->document_counter++, describe_op(afl, 0));
+ afl->document_counter++, describe_op(afl, 0));
if ((doc_fd = open(fn, O_WRONLY | O_CREAT | O_TRUNC, 0600)) >= 0) {
diff --git a/src/afl-showmap.c b/src/afl-showmap.c
index 2a4ab96e..48436c34 100644
--- a/src/afl-showmap.c
+++ b/src/afl-showmap.c
@@ -63,8 +63,7 @@
static char *stdin_file; /* stdin file */
static u8 *in_dir = NULL, /* input folder */
- *out_file = NULL,
- *at_file = NULL; /* Substitution string for @@ */
+ *out_file = NULL, *at_file = NULL; /* Substitution string for @@ */
static u8 *in_data; /* Input data */
@@ -878,8 +877,7 @@ int main(int argc, char **argv_orig, char **envp) {
if (-1 == stat(infile, &statbuf) || !S_ISREG(statbuf.st_mode)) continue;
#endif
- snprintf(outfile, sizeof(outfile), "%s/%s", out_file,
- dir_ent->d_name);
+ snprintf(outfile, sizeof(outfile), "%s/%s", out_file, dir_ent->d_name);
if (read_file(infile)) {
@@ -901,8 +899,6 @@ int main(int argc, char **argv_orig, char **envp) {
run_target(fsrv, use_argv);
tcnt = write_results_to_file(fsrv, out_file);
-
-
}
if (!quiet_mode) {
diff --git a/src/afl-tmin.c b/src/afl-tmin.c
index 78ed63e2..cb53f56f 100644
--- a/src/afl-tmin.c
+++ b/src/afl-tmin.c
@@ -62,8 +62,7 @@
static u8 *mask_bitmap; /* Mask for trace bits (-B) */
static u8 *in_file, /* Minimizer input test case */
- *out_file,
- *output_file; /* Minimizer output file */
+ *out_file, *output_file; /* Minimizer output file */
static u8 *in_data; /* Input data for trimming */