diff options
author | hexcoder <hexcoder-@users.noreply.github.com> | 2021-03-17 08:00:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-17 08:00:32 +0100 |
commit | d17abce59b846d2008eac3dd1a73939e91f4b653 (patch) | |
tree | e2715f85ccae8a64a0bce669a7a767dea363f673 /include | |
parent | 62f067ec71aff384a197511b33142002ca284c66 (diff) | |
parent | b715050de9846ab4b1f30a811af83b7a4b9e09a3 (diff) | |
download | afl++-d17abce59b846d2008eac3dd1a73939e91f4b653.tar.gz |
Merge branch 'dev' into atat-plusplus
Diffstat (limited to 'include')
-rw-r--r-- | include/common.h | 1 | ||||
-rw-r--r-- | include/config.h | 2 | ||||
-rw-r--r-- | include/envs.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index cd728536..b7adbaec 100644 --- a/include/common.h +++ b/include/common.h @@ -48,7 +48,6 @@ void argv_cpy_free(char **argv); char **get_qemu_argv(u8 *own_loc, u8 **target_path_p, int argc, char **argv); char **get_wine_argv(u8 *own_loc, u8 **target_path_p, int argc, char **argv); char * get_afl_env(char *env); -u8 * get_libqasan_path(u8 *own_loc); extern u8 be_quiet; extern u8 *doc_path; /* path to documentation dir */ diff --git a/include/config.h b/include/config.h index 6ada0fbe..b049fee0 100644 --- a/include/config.h +++ b/include/config.h @@ -26,7 +26,7 @@ /* Version string: */ // c = release, a = volatile github dev, e = experimental branch -#define VERSION "++3.11a" +#define VERSION "++3.12a" /****************************************************** * * diff --git a/include/envs.h b/include/envs.h index 4d4d6b0e..cfd73b68 100644 --- a/include/envs.h +++ b/include/envs.h @@ -50,6 +50,7 @@ static char *afl_environment_variables[] = { "AFL_FAST_CAL", "AFL_FORCE_UI", "AFL_FUZZER_ARGS", // oss-fuzz + "AFL_GDB", "AFL_GCC_ALLOWLIST", "AFL_GCC_DENYLIST", "AFL_GCC_BLOCKLIST", @@ -130,6 +131,7 @@ static char *afl_environment_variables[] = { "AFL_PERFORMANCE_FILE", "AFL_PRELOAD", "AFL_PYTHON_MODULE", + "AFL_QEMU_CUSTOM_BIN", "AFL_QEMU_COMPCOV", "AFL_QEMU_COMPCOV_DEBUG", "AFL_QEMU_DEBUG_MAPS", |