diff options
author | Petr Hosek <phosek@chromium.org> | 2019-08-22 00:22:56 +0000 |
---|---|---|
committer | Petr Hosek <phosek@chromium.org> | 2019-08-22 00:22:56 +0000 |
commit | 0f9ca8d128e2a7e6ad77676d18ee0753f3902ba7 (patch) | |
tree | f7a9e72dd10f24774d9be2c71d330bb2b88016a7 | |
parent | 73c62339cf5a6bac19b3e897ddca363e05316d65 (diff) | |
download | compiler-rt-0f9ca8d128e2a7e6ad77676d18ee0753f3902ba7.tar.gz |
[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
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@369606 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/gwp_asan/CMakeLists.txt | 7 | ||||
-rw-r--r-- | lib/gwp_asan/stack_trace_compressor_fuzzer.cpp | 27 |
2 files changed, 17 insertions, 17 deletions
diff --git a/lib/gwp_asan/CMakeLists.txt b/lib/gwp_asan/CMakeLists.txt index 3db583c30..21b36e749 100644 --- a/lib/gwp_asan/CMakeLists.txt +++ b/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/lib/gwp_asan/stack_trace_compressor_fuzzer.cpp b/lib/gwp_asan/stack_trace_compressor_fuzzer.cpp index aa57fdaff..a6249ac6f 100644 --- a/lib/gwp_asan/stack_trace_compressor_fuzzer.cpp +++ b/lib/gwp_asan/stack_trace_compressor_fuzzer.cpp @@ -1,8 +1,7 @@ -#include <cstddef> -#include <cstdint> -#include <cstdio> -#include <cstdlib> -#include <vector> +#include <stddef.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> #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<uint8_t> Buffer(BufferSize); - std::vector<uint8_t> Buffer2(BufferSize); + uint8_t *Buffer = reinterpret_cast<uint8_t *>(malloc(BufferSize)); + uint8_t *Buffer2 = reinterpret_cast<uint8_t *>(malloc(BufferSize)); // Unpack the fuzz bytes. gwp_asan::compression::unpack(Data, Size, - reinterpret_cast<uintptr_t *>(Buffer2.data()), + reinterpret_cast<uintptr_t *>(Buffer2), BufferSize / sizeof(uintptr_t)); // Pack the fuzz bytes. - size_t BytesWritten = gwp_asan::compression::pack( - reinterpret_cast<const uintptr_t *>(Data), Size / sizeof(uintptr_t), - Buffer.data(), BufferSize); + size_t BytesWritten = + gwp_asan::compression::pack(reinterpret_cast<const uintptr_t *>(Data), + Size / sizeof(uintptr_t), Buffer, BufferSize); // Unpack the compressed buffer. size_t DecodedElements = gwp_asan::compression::unpack( - Buffer.data(), BytesWritten, - reinterpret_cast<uintptr_t *>(Buffer2.data()), + Buffer, BytesWritten, reinterpret_cast<uintptr_t *>(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<const uintptr_t *>(Data); - const uintptr_t *DecodedPtrs = - reinterpret_cast<const uintptr_t *>(Buffer2.data()); + const uintptr_t *DecodedPtrs = reinterpret_cast<const uintptr_t *>(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, |