diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | qbdi_mode/template.cpp | 4 | ||||
| -rw-r--r-- | src/afl-analyze.c | 15 | ||||
| -rw-r--r-- | src/afl-fuzz.c | 10 | ||||
| -rw-r--r-- | src/afl-showmap.c | 15 | ||||
| -rw-r--r-- | src/afl-tmin.c | 15 |
6 files changed, 38 insertions, 23 deletions
diff --git a/Makefile b/Makefile index 1bef1e37..1bfa3f77 100644 --- a/Makefile +++ b/Makefile @@ -280,6 +280,8 @@ code-format: ./.custom-format.py -i qemu_mode/libcompcov/*.c ./.custom-format.py -i qemu_mode/libcompcov/*.cc ./.custom-format.py -i qemu_mode/libcompcov/*.h + ./.custom-format.py -i qbdi_mode/*.c + ./.custom-format.py -i qbdi_mode/*.cpp ./.custom-format.py -i *.h ./.custom-format.py -i *.c diff --git a/qbdi_mode/template.cpp b/qbdi_mode/template.cpp index 18766d31..d4ac25e3 100755 --- a/qbdi_mode/template.cpp +++ b/qbdi_mode/template.cpp @@ -114,7 +114,7 @@ void afl_maybe_log(unsigned long cur_loc) { if (afl_area_ptr == NULL) { return; } unsigned long afl_idx = cur_loc ^ afl_prev_loc; - afl_idx &= MAP_SIZE -1; + afl_idx &= MAP_SIZE - 1; INC_AFL_AREA(afl_idx); afl_prev_loc = cur_loc >> 1; @@ -123,7 +123,7 @@ void afl_maybe_log(unsigned long cur_loc) { char *read_file(char *path, unsigned long *length) { unsigned long len; - char * buf; + char * buf; FILE *fp = fopen(path, "rb"); fseek(fp, 0, SEEK_END); diff --git a/src/afl-analyze.c b/src/afl-analyze.c index 0a9b4785..f71893d8 100644 --- a/src/afl-analyze.c +++ b/src/afl-analyze.c @@ -716,11 +716,15 @@ static void set_up_environment(void) { u8* qemu_preload = getenv("QEMU_SET_ENV"); u8* afl_preload = getenv("AFL_PRELOAD"); u8* buf; - + s32 i, afl_preload_size = strlen(afl_preload); for (i = 0; i < afl_preload_size; ++i) { + if (afl_preload[i] == ',') - PFATAL("Comma (',') is not allowed in AFL_PRELOAD when -Q is specified!"); + PFATAL( + "Comma (',') is not allowed in AFL_PRELOAD when -Q is " + "specified!"); + } if (qemu_preload) @@ -729,7 +733,7 @@ static void set_up_environment(void) { buf = alloc_printf("LD_PRELOAD=%s", afl_preload); setenv("QEMU_SET_ENV", buf, 1); - + ck_free(buf); } else { @@ -861,9 +865,8 @@ static void find_binary(u8* fname) { int main(int argc, char** argv) { - s32 opt; - u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0, - use_wine = 0; + s32 opt; + u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0, use_wine = 0; char** use_argv; doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH; diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index 7df82b12..ebc11f01 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -717,11 +717,15 @@ int main(int argc, char** argv) { u8* qemu_preload = getenv("QEMU_SET_ENV"); u8* afl_preload = getenv("AFL_PRELOAD"); u8* buf; - + s32 i, afl_preload_size = strlen(afl_preload); for (i = 0; i < afl_preload_size; ++i) { + if (afl_preload[i] == ',') - PFATAL("Comma (',') is not allowed in AFL_PRELOAD when -Q is specified!"); + PFATAL( + "Comma (',') is not allowed in AFL_PRELOAD when -Q is " + "specified!"); + } if (qemu_preload) @@ -730,7 +734,7 @@ int main(int argc, char** argv) { buf = alloc_printf("LD_PRELOAD=%s", afl_preload); setenv("QEMU_SET_ENV", buf, 1); - + ck_free(buf); } else { diff --git a/src/afl-showmap.c b/src/afl-showmap.c index 0e3e5351..94bbd421 100644 --- a/src/afl-showmap.c +++ b/src/afl-showmap.c @@ -365,11 +365,15 @@ static void set_up_environment(void) { u8* qemu_preload = getenv("QEMU_SET_ENV"); u8* afl_preload = getenv("AFL_PRELOAD"); u8* buf; - + s32 i, afl_preload_size = strlen(afl_preload); for (i = 0; i < afl_preload_size; ++i) { + if (afl_preload[i] == ',') - PFATAL("Comma (',') is not allowed in AFL_PRELOAD when -Q is specified!"); + PFATAL( + "Comma (',') is not allowed in AFL_PRELOAD when -Q is " + "specified!"); + } if (qemu_preload) @@ -378,7 +382,7 @@ static void set_up_environment(void) { buf = alloc_printf("LD_PRELOAD=%s", afl_preload); setenv("QEMU_SET_ENV", buf, 1); - + ck_free(buf); } else { @@ -524,9 +528,8 @@ static void find_binary(u8* fname) { int main(int argc, char** argv) { - s32 opt; - u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0, - use_wine = 0; + s32 opt; + u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0, use_wine = 0; u32 tcnt = 0; char** use_argv; diff --git a/src/afl-tmin.c b/src/afl-tmin.c index 3230c952..b98208f9 100644 --- a/src/afl-tmin.c +++ b/src/afl-tmin.c @@ -889,11 +889,15 @@ static void set_up_environment(void) { u8* qemu_preload = getenv("QEMU_SET_ENV"); u8* afl_preload = getenv("AFL_PRELOAD"); u8* buf; - + s32 i, afl_preload_size = strlen(afl_preload); for (i = 0; i < afl_preload_size; ++i) { + if (afl_preload[i] == ',') - PFATAL("Comma (',') is not allowed in AFL_PRELOAD when -Q is specified!"); + PFATAL( + "Comma (',') is not allowed in AFL_PRELOAD when -Q is " + "specified!"); + } if (qemu_preload) @@ -902,7 +906,7 @@ static void set_up_environment(void) { buf = alloc_printf("LD_PRELOAD=%s", afl_preload); setenv("QEMU_SET_ENV", buf, 1); - + ck_free(buf); } else { @@ -1052,9 +1056,8 @@ static void read_bitmap(u8* fname) { int main(int argc, char** argv) { - s32 opt; - u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0, - use_wine = 0; + s32 opt; + u8 mem_limit_given = 0, timeout_given = 0, unicorn_mode = 0, use_wine = 0; char** use_argv; doc_path = access(DOC_PATH, F_OK) ? "docs" : DOC_PATH; |