diff options
author | van Hauser <vh@thc.org> | 2020-04-17 19:25:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-17 19:25:34 +0200 |
commit | ddea300822e5628482366ecb38adac31717d69bc (patch) | |
tree | 113c1ba9df4b26d206a8bc0f3182222572e5f553 /gcc_plugin/afl-gcc-fast.c | |
parent | 504529c3aa5c80937f9f722f90d0ec55e09c6dd2 (diff) | |
parent | 9900c92ebc73a7706f4604c274ccf6430549e77e (diff) | |
download | afl++-ddea300822e5628482366ecb38adac31717d69bc.tar.gz |
Merge pull request #321 from AFLplusplus/dev 2.64c
Push for next release
Diffstat (limited to 'gcc_plugin/afl-gcc-fast.c')
-rw-r--r-- | gcc_plugin/afl-gcc-fast.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gcc_plugin/afl-gcc-fast.c b/gcc_plugin/afl-gcc-fast.c index fbda08b6..0e51ee62 100644 --- a/gcc_plugin/afl-gcc-fast.c +++ b/gcc_plugin/afl-gcc-fast.c @@ -121,12 +121,12 @@ static void edit_params(u32 argc, char **argv) { if (!strcmp(name, "afl-g++-fast")) { u8 *alt_cxx = getenv("AFL_CXX"); - cc_params[0] = alt_cxx ? alt_cxx : (u8 *)AFL_GCC_CXX; + cc_params[0] = alt_cxx && *alt_cxx ? alt_cxx : (u8 *)AFL_GCC_CXX; } else { u8 *alt_cc = getenv("AFL_CC"); - cc_params[0] = alt_cc ? alt_cc : (u8 *)AFL_GCC_CC; + cc_params[0] = alt_cc && *alt_cc ? alt_cc : (u8 *)AFL_GCC_CC; } @@ -364,6 +364,16 @@ int main(int argc, char **argv, char **envp) { be_quiet = 1; + u8 *ptr; + if (!be_quiet && + ((ptr = getenv("AFL_MAP_SIZE")) || (ptr = getenv("AFL_MAPSIZE")))) { + + u32 map_size = atoi(ptr); + if (map_size != MAP_SIZE) + FATAL("AFL_MAP_SIZE is not supported by afl-gcc-fast"); + + } + check_environment_vars(envp); find_obj(argv[0]); |