about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvan Hauser <vh@thc.org>2020-04-25 13:05:25 +0200
committerGitHub <noreply@github.com>2020-04-25 13:05:25 +0200
commitcefefba244c706eba8e6e100fc9dc2ebb7cd9b27 (patch)
tree8663b20bcff2826b55686ee70ddc7c63e5ca6333
parent42017bbeda83f99979fc22a391b07ce6deebb824 (diff)
parentce9c6df45639db922feafb55259e20c7e82af0bf (diff)
downloadafl++-cefefba244c706eba8e6e100fc9dc2ebb7cd9b27.tar.gz
Merge branch 'master' into dev
-rw-r--r--libdislocator/libdislocator.so.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libdislocator/libdislocator.so.c b/libdislocator/libdislocator.so.c
index 6c8916d6..2a9c94f8 100644
--- a/libdislocator/libdislocator.so.c
+++ b/libdislocator/libdislocator.so.c
@@ -500,4 +500,3 @@ __attribute__((constructor)) void __dislocator_init(void) {
   align_allocations = !!getenv("AFL_ALIGNED_ALLOC");
 
 }
-