ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-20 05:23:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix standalone running with shared libs

Browse Source
This commit is contained in:
vanhauser-thc
2022-09-26 11:55:03 +02:00
parent 77f253c1b9
commit 1ce0dcac3f
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/Changelog.md
View File

@ -5,7 +5,9 @@
### Version ++4.04a (dev) ### Version ++4.04a (dev)
- ... your PR? :) - fix gramatron and grammar_mutatur build scripts
- afl-cc:
- make gcc_mode (afl-gcc-fast) work with gcc down to version 3.6
### Version ++4.03c (release) ### Version ++4.03c (release)

22
instrumentation/afl-compiler-rt.o.c
View File

@ -348,7 +348,7 @@ static void __afl_map_shm(void) {
u32 val = 0; u32 val = 0;
u8 *ptr; u8 *ptr;
if ((ptr = getenv("AFL_MAP_SIZE")) != NULL) val = atoi(ptr); if ((ptr = getenv("AFL_MAP_SIZE")) != NULL) { val = atoi(ptr); }
if (val > MAP_INITIAL_SIZE) { if (val > MAP_INITIAL_SIZE) {
@ -1375,17 +1375,17 @@ __attribute__((constructor(1))) void __afl_auto_second(void) {
if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return; if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return;
u8 *ptr; u8 *ptr;
if (__afl_final_loc) { if (__afl_final_loc > MAP_INITIAL_SIZE) {
if (__afl_area_ptr && __afl_area_ptr != __afl_area_initial) if (__afl_area_ptr && __afl_area_ptr != __afl_area_initial)
free(__afl_area_ptr); free(__afl_area_ptr);
if (__afl_map_addr) if (__afl_map_addr)
ptr = (u8 *)mmap((void *)__afl_map_addr, __afl_final_loc, ptr = (u8 *)mmap((void *)__afl_map_addr, __afl_final_loc + 2,
PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE,
MAP_FIXED_NOREPLACE | MAP_SHARED | MAP_ANONYMOUS, -1, 0); MAP_FIXED_NOREPLACE | MAP_SHARED | MAP_ANONYMOUS, -1, 0);
else else
ptr = (u8 *)malloc(__afl_final_loc); ptr = (u8 *)malloc(__afl_final_loc + 2);
if (ptr && (ssize_t)ptr != -1) { if (ptr && (ssize_t)ptr != -1) {
@ -1407,14 +1407,18 @@ __attribute__((constructor(0))) void __afl_auto_first(void) {
__afl_already_initialized_first = 1; __afl_already_initialized_first = 1;
if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return; if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return;
u8 *ptr = (u8 *)malloc(MAP_INITIAL_SIZE);
if (ptr && (ssize_t)ptr != -1) { /*
u8 *ptr = (u8 *)malloc(MAP_INITIAL_SIZE);
__afl_area_ptr = ptr; if (ptr && (ssize_t)ptr != -1) {
__afl_area_ptr_backup = __afl_area_ptr;
} __afl_area_ptr = ptr;
__afl_area_ptr_backup = __afl_area_ptr;
}
*/
} // ptr memleak report is a false positive } // ptr memleak report is a false positive