diff options
| author | van Hauser <vh@thc.org> | 2021-05-21 11:00:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 11:00:52 +0200 |
| commit | 06d703bf66b95e61d3cbefbff1edad6af172e342 (patch) | |
| tree | 414a4dff0a16bf3897cf59281c6f8b6c876e0c64 | |
| parent | 5997a4fc09163c1baa186f5a9d00c4c8668a72b1 (diff) | |
| parent | da2d4d8258d725f79c2daa22bf3b1a59c593e472 (diff) | |
| download | afl++-06d703bf66b95e61d3cbefbff1edad6af172e342.tar.gz | |
Merge branch 'stable' into dev
| -rw-r--r-- | frida_mode/GNUmakefile | 3 | ||||
| -rw-r--r-- | qemu_mode/libqasan/libqasan.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/frida_mode/GNUmakefile b/frida_mode/GNUmakefile index a0387cac..20fbb544 100644 --- a/frida_mode/GNUmakefile +++ b/frida_mode/GNUmakefile @@ -97,6 +97,9 @@ all: $(FRIDA_TRACE) 32: CFLAGS="-m32" LDFLAGS="-m32" ARCH="x86" make all +32: + CFLAGS="-m32" LDFLAGS="-m32" ARCH="x86" make all + $(BUILD_DIR): mkdir -p $(BUILD_DIR) diff --git a/qemu_mode/libqasan/libqasan.c b/qemu_mode/libqasan/libqasan.c index a64db10f..d4742e3e 100644 --- a/qemu_mode/libqasan/libqasan.c +++ b/qemu_mode/libqasan/libqasan.c @@ -69,6 +69,9 @@ __attribute__((constructor)) void __libqasan_init() { __libqasan_is_initialized = 1; __libqasan_init_hooks(); + + if (getenv("AFL_INST_LIBS") || getenv("QASAN_HOTPACH")) + __libqasan_hotpatch(); if (getenv("AFL_INST_LIBS") || getenv("QASAN_HOTPACH")) __libqasan_hotpatch(); |