From e31055e48610796145723ce89d8f5cd14352f8b6 Mon Sep 17 00:00:00 2001
From: van Hauser <vh@thc.org>
Date: Fri, 30 Apr 2021 16:51:40 +0200
Subject: [PATCH] fix afl++ for pie targets (#5691)

* output afl++ setup

* update commit id

* update afl++ commit id

* asan + cmplog fix

* update commit id

* update and enhance afl++

* update afl++ commit id, better run asan options

* fix linter

* add debug_afl script

* Update debug_afl

* Update compile_afl

* fix for karchive

* put debug_afl in the docker container

* asan poison fix

* fix asan settings for zeek

* update afl++ commit id

* fix

* update afl++ commit id

* final touches

* remove map size

* remove old comment

* llvm 13 fix

* enhance documentation

* fix capstone build.sh

* update doc

* add afl++ ctx-2 coverage option

* set to 30% chance for ctx-2

* fix afl++ pie targets

* gracefuly fail for qemu hook

Co-authored-by: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
---
 infra/base-images/base-builder/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index ad2eeb948..f7dc0ee4d 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -181,7 +181,7 @@ WORKDIR $SRC
 # TODO: switch to -b stable once we can.
 RUN git clone https://github.com/AFLplusplus/AFLplusplus.git aflplusplus && \
     cd aflplusplus && \
-    git checkout 3ff4ca348c344bded53f53b0d0c4b020a188f26e
+    git checkout f4cc718fdc4571f56280a1efad3645125bee2154
 
 RUN cd $SRC && \
     curl -L -O https://github.com/google/honggfuzz/archive/oss-fuzz.tar.gz && \