diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-06-03 11:41:30 +0200 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-06-03 11:41:30 +0200 |
| commit | 2d8c3d29345b57fd7e4d2fcb335151d7ef8f08ca (patch) | |
| tree | fb2b1b8ceeb4b987c6c61a981a0ab42ecc901ace /src/afl-common.c | |
| parent | f1192b2d16116fb6c8dc2673e37ec426b7792312 (diff) | |
| parent | fc164e4709f1f1c91f9343eb116627417e7f267f (diff) | |
| download | afl++-2d8c3d29345b57fd7e4d2fcb335151d7ef8f08ca.tar.gz | |
fix conflicts
Diffstat (limited to 'src/afl-common.c')
| -rw-r--r-- | src/afl-common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/afl-common.c b/src/afl-common.c index c9b4638a..f4cba573 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -253,7 +253,8 @@ char **get_qemu_argv(u8 *own_loc, u8 **target_path_p, int argc, char **argv) { "binaries that are\n" " instrumented at compile time with afl-gcc. It is also possible to " "use it as a\n" - " traditional non-instrumented fuzzer by specifying '-n' in the command " + " traditional non-instrumented fuzzer by specifying '-n' in the " + "command " "line.\n"); FATAL("Failed to locate 'afl-qemu-trace'."); @@ -353,7 +354,8 @@ char **get_wine_argv(u8 *own_loc, u8 **target_path_p, int argc, char **argv) { "binaries that are\n" " instrumented at compile time with afl-gcc. It is also possible to " "use it as a\n" - " traditional non-instrumented fuzzer by specifying '-n' in the command " + " traditional non-instrumented fuzzer by specifying '-n' in the " + "command " "line.\n", ncp); |