From 3dd22585199195d4656154205ab631b8dd406143 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Thu, 22 Aug 2019 00:22:56 +0000 Subject: [PATCH] [GWP-ASan] Remove c++ standard lib dependency. Remove c++ standard library dependency for now for @phosek. They have a complicated build system that breaks with the fuzzer target here. Also added a todo to remedy later. Differential Revision: https://reviews.llvm.org/D66568 llvm-svn: 369606 --- compiler-rt/lib/gwp_asan/CMakeLists.txt | 7 +++-- .../stack_trace_compressor_fuzzer.cpp | 27 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/compiler-rt/lib/gwp_asan/CMakeLists.txt b/compiler-rt/lib/gwp_asan/CMakeLists.txt index 3db583c30d32..21b36e749337 100644 --- a/compiler-rt/lib/gwp_asan/CMakeLists.txt +++ b/compiler-rt/lib/gwp_asan/CMakeLists.txt @@ -108,8 +108,11 @@ if (COMPILER_RT_HAS_GWP_ASAN) ${GWP_ASAN_HEADERS}) set_target_properties( stack_trace_compressor_fuzzer PROPERTIES FOLDER "Fuzzers") - target_compile_options( - stack_trace_compressor_fuzzer PRIVATE -fsanitize=fuzzer-no-link) + + # TODO(phosek): Remove -nostdlib++ and remove the "no c++ standard library + # for compiler-rt" dependency here. + target_compile_options(stack_trace_compressor_fuzzer + PRIVATE -nostdlib++ -fsanitize=fuzzer-no-link) set_target_properties( stack_trace_compressor_fuzzer PROPERTIES LINK_FLAGS -fsanitize=fuzzer) add_dependencies(stack_trace_compressor_fuzzer fuzzer) diff --git a/compiler-rt/lib/gwp_asan/stack_trace_compressor_fuzzer.cpp b/compiler-rt/lib/gwp_asan/stack_trace_compressor_fuzzer.cpp index aa57fdaff636..a6249ac6f80a 100644 --- a/compiler-rt/lib/gwp_asan/stack_trace_compressor_fuzzer.cpp +++ b/compiler-rt/lib/gwp_asan/stack_trace_compressor_fuzzer.cpp @@ -1,8 +1,7 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include #include "gwp_asan/stack_trace_compressor.h" @@ -10,23 +9,22 @@ constexpr size_t kBytesForLargestVarInt = (sizeof(uintptr_t) * 8) / 7 + 1; extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { size_t BufferSize = kBytesForLargestVarInt * Size / sizeof(uintptr_t); - std::vector Buffer(BufferSize); - std::vector Buffer2(BufferSize); + uint8_t *Buffer = reinterpret_cast(malloc(BufferSize)); + uint8_t *Buffer2 = reinterpret_cast(malloc(BufferSize)); // Unpack the fuzz bytes. gwp_asan::compression::unpack(Data, Size, - reinterpret_cast(Buffer2.data()), + reinterpret_cast(Buffer2), BufferSize / sizeof(uintptr_t)); // Pack the fuzz bytes. - size_t BytesWritten = gwp_asan::compression::pack( - reinterpret_cast(Data), Size / sizeof(uintptr_t), - Buffer.data(), BufferSize); + size_t BytesWritten = + gwp_asan::compression::pack(reinterpret_cast(Data), + Size / sizeof(uintptr_t), Buffer, BufferSize); // Unpack the compressed buffer. size_t DecodedElements = gwp_asan::compression::unpack( - Buffer.data(), BytesWritten, - reinterpret_cast(Buffer2.data()), + Buffer, BytesWritten, reinterpret_cast(Buffer2), BufferSize / sizeof(uintptr_t)); // Ensure that every element was encoded and decoded properly. @@ -35,8 +33,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { // Ensure that the compression and uncompression resulted in the same trace. const uintptr_t *FuzzPtrs = reinterpret_cast(Data); - const uintptr_t *DecodedPtrs = - reinterpret_cast(Buffer2.data()); + const uintptr_t *DecodedPtrs = reinterpret_cast(Buffer2); for (size_t i = 0; i < Size / sizeof(uintptr_t); ++i) { if (FuzzPtrs[i] != DecodedPtrs[i]) { fprintf(stderr, "FuzzPtrs[%zu] != DecodedPtrs[%zu] (0x%zx vs. 0x%zx)", i,