diff options
author | George Karpenkov <ekarpenkov@apple.com> | 2017-08-26 17:17:37 +0000 |
---|---|---|
committer | George Karpenkov <ekarpenkov@apple.com> | 2017-08-26 17:17:37 +0000 |
commit | 740573d1259e500ea7f323d213d476784c305372 (patch) | |
tree | e61e170796894865237d24a8a1f98cfa249892a8 /lib/fuzzer/FuzzerMutate.h | |
parent | 27fb0f25514625a8adb42338015e635bd6ef0626 (diff) |
[libFuzzer] Use custom allocators for STL containers in libFuzzer
Avoids ODR violations causing spurious ASAN container overflow warnings.
Differential Revision: https://reviews.llvm.org/D37086
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@311830 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/fuzzer/FuzzerMutate.h')
-rw-r--r-- | lib/fuzzer/FuzzerMutate.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/fuzzer/FuzzerMutate.h b/lib/fuzzer/FuzzerMutate.h index 84b04c0db..d1613b22b 100644 --- a/lib/fuzzer/FuzzerMutate.h +++ b/lib/fuzzer/FuzzerMutate.h @@ -96,7 +96,7 @@ private: size_t AddWordFromDictionary(Dictionary &D, uint8_t *Data, size_t Size, size_t MaxSize); size_t MutateImpl(uint8_t *Data, size_t Size, size_t MaxSize, - const std::vector<Mutator> &Mutators); + const fuzzer::vector<Mutator> &Mutators); size_t InsertPartOf(const uint8_t *From, size_t FromSize, uint8_t *To, size_t ToSize, size_t MaxToSize); @@ -128,21 +128,21 @@ private: // entries that led to successfull discoveries in the past mutations. Dictionary PersistentAutoDictionary; - std::vector<Mutator> CurrentMutatorSequence; - std::vector<DictionaryEntry *> CurrentDictionaryEntrySequence; + fuzzer::vector<Mutator> CurrentMutatorSequence; + fuzzer::vector<DictionaryEntry *> CurrentDictionaryEntrySequence; static const size_t kCmpDictionaryEntriesDequeSize = 16; DictionaryEntry CmpDictionaryEntriesDeque[kCmpDictionaryEntriesDequeSize]; size_t CmpDictionaryEntriesDequeIdx = 0; const InputCorpus *Corpus = nullptr; - std::vector<uint8_t> MutateInPlaceHere; + fuzzer::vector<uint8_t> MutateInPlaceHere; // CustomCrossOver needs its own buffer as a custom implementation may call // LLVMFuzzerMutate, which in turn may resize MutateInPlaceHere. - std::vector<uint8_t> CustomCrossOverInPlaceHere; + fuzzer::vector<uint8_t> CustomCrossOverInPlaceHere; - std::vector<Mutator> Mutators; - std::vector<Mutator> DefaultMutators; + fuzzer::vector<Mutator> Mutators; + fuzzer::vector<Mutator> DefaultMutators; }; } // namespace fuzzer |