diff options
| author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-02-25 21:24:43 +0100 |
|---|---|---|
| committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-02-25 21:24:43 +0100 |
| commit | e12edca29a43f728868b1105ca071c85a0c4a11e (patch) | |
| tree | d4b17cc4b173783e68322eb068489a9afe197ff5 /include | |
| parent | 7e0663e4e0040efabef875d6bcbb4e2c7a9085d7 (diff) | |
| parent | 4bd736e1a79ada95ae4266be72c331106e580075 (diff) | |
| download | afl++-e12edca29a43f728868b1105ca071c85a0c4a11e.tar.gz | |
Merge branch 'master' of github.com:vanhauser-thc/AFLplusplus
Diffstat (limited to 'include')
| -rw-r--r-- | include/afl-as.h | 2 | ||||
| -rw-r--r-- | include/config.h | 2 | ||||
| -rw-r--r-- | include/envs.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/afl-as.h b/include/afl-as.h index bd5e734a..de9fb646 100644 --- a/include/afl-as.h +++ b/include/afl-as.h @@ -261,6 +261,7 @@ static const u8* main_payload_32 = " je __afl_setup_abort\n" "\n" #endif + " movb $1, (%eax)\n" " /* Store the address of the SHM region. */\n" "\n" " movl %eax, __afl_area_ptr\n" @@ -563,6 +564,7 @@ static const u8* main_payload_64 = " je __afl_setup_abort\n" "\n" #endif + " movb $1, (%rax)\n" " /* Store the address of the SHM region. */\n" "\n" " movq %rax, %rdx\n" diff --git a/include/config.h b/include/config.h index 12e2d092..59a476c9 100644 --- a/include/config.h +++ b/include/config.h @@ -27,7 +27,7 @@ /* Version string: */ // c = release, d = volatile github dev, e = experimental branch -#define VERSION "++2.60d" +#define VERSION "++2.61d" /****************************************************** * * diff --git a/include/envs.h b/include/envs.h index 4650dc54..8e6e3731 100644 --- a/include/envs.h +++ b/include/envs.h @@ -59,7 +59,7 @@ const char *afl_environment_variables[] = { "AFL_NO_CPU_RED", "AFL_NO_FORKSRV", "AFL_NO_UI", - "AFL_NO_X86", // not really an env but we dont want to warn on it + "AFL_NO_X86", // not really an env but we dont want to warn on it "AFL_PATH", "AFL_PERFORMANCE_FILE", "AFL_PERSISTENT", |