From 03c020f4bdddbcef6b5cd2c50cd8f88f9b20c3b6 Mon Sep 17 00:00:00 2001 From: Dongjia Zhang Date: Fri, 21 Jan 2022 17:08:21 +0900 Subject: [PATCH] Asan fix (#485) --- fuzzers/frida_libpng/harness.cc | 5 +++-- libafl_frida/src/asan/asan_rt.rs | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fuzzers/frida_libpng/harness.cc b/fuzzers/frida_libpng/harness.cc index ff9e16f62a..b22ec864b4 100644 --- a/fuzzers/frida_libpng/harness.cc +++ b/fuzzers/frida_libpng/harness.cc @@ -132,8 +132,9 @@ HARNESS_EXPORTS extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_ return 0; } - - // func1(); +#ifdef TEST_ASAN + func1(); +#endif std::vector v(data, data + size); if (png_sig_cmp(v.data(), 0, kPngHeaderSize)) { diff --git a/libafl_frida/src/asan/asan_rt.rs b/libafl_frida/src/asan/asan_rt.rs index 4c3d1fc73a..b28f594531 100644 --- a/libafl_frida/src/asan/asan_rt.rs +++ b/libafl_frida/src/asan/asan_rt.rs @@ -1862,11 +1862,11 @@ impl AsanRuntime { ); self.blob_report = Some(ops_report.finalize().unwrap().into_boxed_slice()); - self.blob_check_mem_byte = Some(self.generate_shadow_check_blob(0)); - self.blob_check_mem_halfword = Some(self.generate_shadow_check_blob(1)); - self.blob_check_mem_dword = Some(self.generate_shadow_check_blob(2)); - self.blob_check_mem_qword = Some(self.generate_shadow_check_blob(3)); - self.blob_check_mem_16bytes = Some(self.generate_shadow_check_blob(4)); + self.blob_check_mem_byte = Some(self.generate_shadow_check_blob(1)); + self.blob_check_mem_halfword = Some(self.generate_shadow_check_blob(2)); + self.blob_check_mem_dword = Some(self.generate_shadow_check_blob(3)); + self.blob_check_mem_qword = Some(self.generate_shadow_check_blob(4)); + self.blob_check_mem_16bytes = Some(self.generate_shadow_check_blob(5)); } ///