diff options
| -rw-r--r-- | src/afl-showmap.c | 10 | ||||
| -rw-r--r-- | unicorn_mode/samples/c/harness.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/afl-showmap.c b/src/afl-showmap.c index 95c4592d..cd4f2b7b 100644 --- a/src/afl-showmap.c +++ b/src/afl-showmap.c @@ -80,7 +80,7 @@ u8 *out_file, /* Trace output file */ *stdin_file, /* stdin file */ *in_dir, /* input folder */ *doc_path, /* Path to docs */ - *at_file; /* Substitution string for @@ */ + *at_file = NULL; /* Substitution string for @@ */ static u8* in_data; /* Input data */ @@ -901,11 +901,13 @@ int main(int argc, char** argv, char** envp) { if (in_dir) { if (at_file) PFATAL("Options -A and -i are mutually exclusive"); - at_file = "@@"; + detect_file_args(argv + optind, ""); - } + } else { - detect_file_args(argv + optind, ""); + detect_file_args(argv + optind, at_file); + + } for (i = optind; i < argc; i++) if (strcmp(argv[i], "@@") == 0) arg_offset = i; diff --git a/unicorn_mode/samples/c/harness.c b/unicorn_mode/samples/c/harness.c index 2eddeb8e..eb226f9a 100644 --- a/unicorn_mode/samples/c/harness.c +++ b/unicorn_mode/samples/c/harness.c @@ -203,7 +203,7 @@ int main(int argc, char **argv, char **envp) { // Setup the Stack mem_map_checked(uc, STACK_ADDRESS - STACK_SIZE, STACK_SIZE, UC_PROT_READ | UC_PROT_WRITE); uint64_t stack_val = STACK_ADDRESS; - printf("%lu", stack_val); + //printf("Stack at %lu\n", stack_val); uc_reg_write(uc, UC_X86_REG_RSP, &stack_val); // reserve some space for our input data |