diff options
| author | van Hauser <vh@thc.org> | 2021-03-01 10:12:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 10:12:04 +0100 |
| commit | bd0a23de73011a390714b9f3836a46443054fdd5 (patch) | |
| tree | 9b2335f357e84e18e4c8259581360923921ca8b2 /src | |
| parent | 5cf0655071a83b1c87490be8399fe2365f087223 (diff) | |
| parent | 4619a1395b9a414e5e11148d79fde3a7fa348e87 (diff) | |
| download | afl++-bd0a23de73011a390714b9f3836a46443054fdd5.tar.gz | |
Merge pull request #767 from AFLplusplus/dev 3.10c
Final push for release
Diffstat (limited to 'src')
| -rw-r--r-- | src/afl-common.c | 10 | ||||
| -rw-r--r-- | src/afl-forkserver.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/afl-common.c b/src/afl-common.c index 078ffb9d..a306fe5e 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -47,6 +47,10 @@ u8 be_quiet = 0; u8 *doc_path = ""; u8 last_intr = 0; +#ifndef AFL_PATH + #define AFL_PATH "/usr/local/lib/afl/" +#endif + void detect_file_args(char **argv, u8 *prog_in, bool *use_stdin) { u32 i = 0; @@ -372,11 +376,11 @@ u8 *get_libqasan_path(u8 *own_loc) { } - if (!access(BIN_PATH "/libqasan.so", X_OK)) { + if (!access(AFL_PATH "/libqasan.so", X_OK)) { if (cp) { ck_free(cp); } - return ck_strdup(BIN_PATH "/libqasan.so"); + return ck_strdup(AFL_PATH "/libqasan.so"); } @@ -1131,7 +1135,7 @@ u32 get_map_size(void) { } - if (map_size % 32) { map_size = (((map_size >> 5) + 1) << 5); } + if (map_size % 64) { map_size = (((map_size >> 6) + 1) << 6); } } diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c index 9ee59822..fd5edc98 100644 --- a/src/afl-forkserver.c +++ b/src/afl-forkserver.c @@ -656,11 +656,11 @@ void afl_fsrv_start(afl_forkserver_t *fsrv, char **argv, if (!fsrv->map_size) { fsrv->map_size = MAP_SIZE; } - if (unlikely(tmp_map_size % 32)) { + if (unlikely(tmp_map_size % 64)) { // should not happen WARNF("Target reported non-aligned map size of %u", tmp_map_size); - tmp_map_size = (((tmp_map_size + 31) >> 5) << 5); + tmp_map_size = (((tmp_map_size + 63) >> 6) << 6); } |