diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 10:12:41 +0200 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 10:12:41 +0200 |
| commit | 1d62bf1c37b9a1803745abb41ed41057959a45d2 (patch) | |
| tree | 3e33e4d0535291ca5a6968c3ed5bb18f72acd20e /src/afl-common.c | |
| parent | 982d46e7cb2c7cabcd8969e6303c3cb8f3d8e56a (diff) | |
| parent | 1374e65401c9d40b449c78459a2d0241c779b989 (diff) | |
| download | afl++-1d62bf1c37b9a1803745abb41ed41057959a45d2.tar.gz | |
solve conflicts
Diffstat (limited to 'src/afl-common.c')
| -rw-r--r-- | src/afl-common.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/afl-common.c b/src/afl-common.c index 7eba6ae4..1ac1a2f3 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -292,11 +292,10 @@ char **get_wine_argv(u8 *own_loc, u8 **target_path_p, int argc, char **argv) { *rsl = 0; cp = alloc_printf("%s/afl-qemu-trace", own_copy); - ck_free(own_copy); - if (!access(cp, X_OK)) { + if (cp && !access(cp, X_OK)) { - if (cp != NULL) ck_free(cp); + ck_free(cp); cp = alloc_printf("%s/afl-wine-trace", own_copy); @@ -309,10 +308,14 @@ char **get_wine_argv(u8 *own_loc, u8 **target_path_p, int argc, char **argv) { } - } else + ck_free(own_copy); + + } else { ck_free(own_copy); + } + u8 *ncp = BIN_PATH "/afl-qemu-trace"; if (!access(ncp, X_OK)) { |