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 /examples/aflpp_driver | |
| parent | f1192b2d16116fb6c8dc2673e37ec426b7792312 (diff) | |
| parent | fc164e4709f1f1c91f9343eb116627417e7f267f (diff) | |
| download | afl++-2d8c3d29345b57fd7e4d2fcb335151d7ef8f08ca.tar.gz | |
fix conflicts
Diffstat (limited to 'examples/aflpp_driver')
| -rw-r--r-- | examples/aflpp_driver/aflpp_qemu_driver.c | 6 | ||||
| -rw-r--r-- | examples/aflpp_driver/aflpp_qemu_driver_hook.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/examples/aflpp_driver/aflpp_qemu_driver.c b/examples/aflpp_driver/aflpp_qemu_driver.c index 0944148e..404ce84c 100644 --- a/examples/aflpp_driver/aflpp_qemu_driver.c +++ b/examples/aflpp_driver/aflpp_qemu_driver.c @@ -17,8 +17,8 @@ void afl_qemu_driver_stdin_input(void) { } int main(int argc, char **argv) { - if (LLVMFuzzerInitialize) - LLVMFuzzerInitialize(&argc, &argv); + + if (LLVMFuzzerInitialize) LLVMFuzzerInitialize(&argc, &argv); // Do any other expensive one-time initialization here. if (getenv("AFL_QEMU_DRIVER_NO_HOOK")) { @@ -33,4 +33,6 @@ int main(int argc, char **argv) { } return 0; + } + diff --git a/examples/aflpp_driver/aflpp_qemu_driver_hook.c b/examples/aflpp_driver/aflpp_qemu_driver_hook.c index 17a84668..823cc42d 100644 --- a/examples/aflpp_driver/aflpp_qemu_driver_hook.c +++ b/examples/aflpp_driver/aflpp_qemu_driver_hook.c @@ -7,9 +7,9 @@ #define REGS_RSI 6 void afl_persistent_hook(uint64_t *regs, uint64_t guest_base, - uint8_t* input_buf, uint32_t input_len) { + uint8_t *input_buf, uint32_t input_len) { - memcpy(g2h(regs[REGS_RDI]), input_buf, input_len); + memcpy(g2h(regs[REGS_RDI]), input_buf, input_len); regs[REGS_RSI] = input_len; } @@ -19,3 +19,4 @@ int afl_persistent_hook_init(void) { return 1; } + |