diff options
Diffstat (limited to 'lib/Fuzzer')
67 files changed, 95 insertions, 92 deletions
diff --git a/lib/Fuzzer/FuzzerDriver.cpp b/lib/Fuzzer/FuzzerDriver.cpp index e93c79cfcec6c..9aad3771784de 100644 --- a/lib/Fuzzer/FuzzerDriver.cpp +++ b/lib/Fuzzer/FuzzerDriver.cpp @@ -10,9 +10,9 @@ //===----------------------------------------------------------------------===// #include "FuzzerCorpus.h" +#include "FuzzerIO.h" #include "FuzzerInterface.h" #include "FuzzerInternal.h" -#include "FuzzerIO.h" #include "FuzzerMutate.h" #include "FuzzerRandom.h" #include "FuzzerShmem.h" @@ -149,7 +149,7 @@ static bool ParseOneFlag(const char *Param) { int Val = MyStol(Str); *FlagDescriptions[F].IntFlag = Val; if (Flags.verbosity >= 2) - Printf("Flag: %s %d\n", Name, Val);; + Printf("Flag: %s %d\n", Name, Val); return true; } else if (FlagDescriptions[F].UIntFlag) { unsigned int Val = std::stoul(Str); diff --git a/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp b/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp index 77521698c80a4..321b3ec5d4140 100644 --- a/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp +++ b/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp @@ -14,6 +14,8 @@ #include "FuzzerExtFunctions.h" #include "FuzzerIO.h" #include "Windows.h" + +// This must be included after Windows.h. #include "Psapi.h" namespace fuzzer { diff --git a/lib/Fuzzer/FuzzerLoop.cpp b/lib/Fuzzer/FuzzerLoop.cpp index 14caa203c5ef6..f6083282ab615 100644 --- a/lib/Fuzzer/FuzzerLoop.cpp +++ b/lib/Fuzzer/FuzzerLoop.cpp @@ -10,8 +10,8 @@ //===----------------------------------------------------------------------===// #include "FuzzerCorpus.h" -#include "FuzzerInternal.h" #include "FuzzerIO.h" +#include "FuzzerInternal.h" #include "FuzzerMutate.h" #include "FuzzerRandom.h" #include "FuzzerShmem.h" diff --git a/lib/Fuzzer/FuzzerMerge.cpp b/lib/Fuzzer/FuzzerMerge.cpp index e66460c29e2f8..612f4bbb28f21 100644 --- a/lib/Fuzzer/FuzzerMerge.cpp +++ b/lib/Fuzzer/FuzzerMerge.cpp @@ -9,9 +9,9 @@ // Merging corpora. //===----------------------------------------------------------------------===// -#include "FuzzerInternal.h" -#include "FuzzerIO.h" #include "FuzzerMerge.h" +#include "FuzzerIO.h" +#include "FuzzerInternal.h" #include "FuzzerTracePC.h" #include "FuzzerUtil.h" diff --git a/lib/Fuzzer/FuzzerMutate.cpp b/lib/Fuzzer/FuzzerMutate.cpp index e60d4130de106..53cb9027e455f 100644 --- a/lib/Fuzzer/FuzzerMutate.cpp +++ b/lib/Fuzzer/FuzzerMutate.cpp @@ -9,11 +9,11 @@ // Mutate a test input. //===----------------------------------------------------------------------===// +#include "FuzzerMutate.h" #include "FuzzerCorpus.h" #include "FuzzerDefs.h" #include "FuzzerExtFunctions.h" #include "FuzzerIO.h" -#include "FuzzerMutate.h" #include "FuzzerOptions.h" namespace fuzzer { diff --git a/lib/Fuzzer/FuzzerShmemPosix.cpp b/lib/Fuzzer/FuzzerShmemPosix.cpp index 2723bdd86f487..50cdcfb509dc2 100644 --- a/lib/Fuzzer/FuzzerShmemPosix.cpp +++ b/lib/Fuzzer/FuzzerShmemPosix.cpp @@ -14,14 +14,14 @@ #include "FuzzerIO.h" #include "FuzzerShmem.h" -#include <sys/types.h> -#include <sys/stat.h> #include <errno.h> #include <fcntl.h> -#include <sys/mman.h> #include <semaphore.h> #include <stdio.h> #include <stdlib.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/types.h> #include <unistd.h> namespace fuzzer { diff --git a/lib/Fuzzer/FuzzerShmemWindows.cpp b/lib/Fuzzer/FuzzerShmemWindows.cpp index 6325b4b8e5b41..d330ebf4fd07a 100644 --- a/lib/Fuzzer/FuzzerShmemWindows.cpp +++ b/lib/Fuzzer/FuzzerShmemWindows.cpp @@ -14,10 +14,10 @@ #include "FuzzerIO.h" #include "FuzzerShmem.h" -#include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> #include <stdio.h> +#include <sys/stat.h> +#include <sys/types.h> namespace fuzzer { diff --git a/lib/Fuzzer/FuzzerTracePC.cpp b/lib/Fuzzer/FuzzerTracePC.cpp index ce0f7a47eee64..ea93468ea0ed2 100644 --- a/lib/Fuzzer/FuzzerTracePC.cpp +++ b/lib/Fuzzer/FuzzerTracePC.cpp @@ -12,12 +12,12 @@ // //===----------------------------------------------------------------------===// +#include "FuzzerTracePC.h" #include "FuzzerCorpus.h" #include "FuzzerDefs.h" #include "FuzzerDictionary.h" #include "FuzzerExtFunctions.h" #include "FuzzerIO.h" -#include "FuzzerTracePC.h" #include "FuzzerUtil.h" #include "FuzzerValueBitMap.h" #include <map> diff --git a/lib/Fuzzer/FuzzerTraceState.cpp b/lib/Fuzzer/FuzzerTraceState.cpp index a486223d650c9..8670e2ad67277 100644 --- a/lib/Fuzzer/FuzzerTraceState.cpp +++ b/lib/Fuzzer/FuzzerTraceState.cpp @@ -10,8 +10,8 @@ //===----------------------------------------------------------------------===// #include "FuzzerDictionary.h" -#include "FuzzerInternal.h" #include "FuzzerIO.h" +#include "FuzzerInternal.h" #include "FuzzerMutate.h" #include "FuzzerTracePC.h" #include <algorithm> diff --git a/lib/Fuzzer/FuzzerUtilWindows.cpp b/lib/Fuzzer/FuzzerUtilWindows.cpp index 08bb3cf3be157..25ac976fc2dbb 100644 --- a/lib/Fuzzer/FuzzerUtilWindows.cpp +++ b/lib/Fuzzer/FuzzerUtilWindows.cpp @@ -22,6 +22,8 @@ #include <stdio.h> #include <sys/types.h> #include <windows.h> + +// This must be included after windows.h. #include <Psapi.h> namespace fuzzer { diff --git a/lib/Fuzzer/afl/afl_driver.cpp b/lib/Fuzzer/afl/afl_driver.cpp index 3815ed11cf60b..d0521bdfdd67b 100644 --- a/lib/Fuzzer/afl/afl_driver.cpp +++ b/lib/Fuzzer/afl/afl_driver.cpp @@ -12,8 +12,8 @@ Usage: ################################################################################ cat << EOF > test_fuzzer.cc -#include <stdint.h> #include <stddef.h> +#include <stdint.h> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (size > 0 && data[0] == 'H') if (size > 1 && data[1] == 'I') @@ -50,18 +50,18 @@ statistics from the file. If that fails then the process will quit. */ #include <assert.h> -#include <stdio.h> +#include <errno.h> +#include <signal.h> #include <stdint.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> -#include <errno.h> -#include <signal.h> #include <sys/resource.h> #include <sys/time.h> +#include <unistd.h> -#include <iostream> #include <fstream> +#include <iostream> #include <vector> // Platform detection. Copied from FuzzerInternal.h diff --git a/lib/Fuzzer/test/AFLDriverTest.cpp b/lib/Fuzzer/test/AFLDriverTest.cpp index e3f5f7100883c..b949adc7de159 100644 --- a/lib/Fuzzer/test/AFLDriverTest.cpp +++ b/lib/Fuzzer/test/AFLDriverTest.cpp @@ -3,8 +3,8 @@ // Contains dummy functions used to avoid dependency on AFL. #include <stdint.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> extern "C" void __afl_manual_init() {} diff --git a/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp b/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp index 69b0d59fb8eff..dfb6007b7970d 100644 --- a/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp +++ b/lib/Fuzzer/test/AbsNegAndConstant64Test.cpp @@ -2,11 +2,11 @@ // License. See LICENSE.TXT for details. // abs(x) < 0 and y == Const puzzle, 64-bit variant. -#include <cstring> -#include <cstdint> -#include <cstdlib> #include <cstddef> +#include <cstdint> #include <cstdio> +#include <cstdlib> +#include <cstring> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { if (Size < 16) return 0; diff --git a/lib/Fuzzer/test/AbsNegAndConstantTest.cpp b/lib/Fuzzer/test/AbsNegAndConstantTest.cpp index 69075a454c99b..e9d983ff1ebfe 100644 --- a/lib/Fuzzer/test/AbsNegAndConstantTest.cpp +++ b/lib/Fuzzer/test/AbsNegAndConstantTest.cpp @@ -2,11 +2,11 @@ // License. See LICENSE.TXT for details. // abs(x) < 0 and y == Const puzzle. -#include <cstring> -#include <cstdint> -#include <cstdlib> #include <cstddef> +#include <cstdint> #include <cstdio> +#include <cstdlib> +#include <cstring> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { if (Size < 8) return 0; diff --git a/lib/Fuzzer/test/AccumulateAllocationsTest.cpp b/lib/Fuzzer/test/AccumulateAllocationsTest.cpp index 604d8fa299aeb..e9acd7ccbd30f 100644 --- a/lib/Fuzzer/test/AccumulateAllocationsTest.cpp +++ b/lib/Fuzzer/test/AccumulateAllocationsTest.cpp @@ -2,8 +2,8 @@ // License. See LICENSE.TXT for details. // Test with a more mallocs than frees, but no leak. -#include <cstdint> #include <cstddef> +#include <cstdint> const int kAllocatedPointersSize = 10000; int NumAllocatedPointers = 0; diff --git a/lib/Fuzzer/test/BadStrcmpTest.cpp b/lib/Fuzzer/test/BadStrcmpTest.cpp index 159cd7ea5f708..ba2b068f741d4 100644 --- a/lib/Fuzzer/test/BadStrcmpTest.cpp +++ b/lib/Fuzzer/test/BadStrcmpTest.cpp @@ -2,9 +2,9 @@ // License. See LICENSE.TXT for details. // Test that we don't creash in case of bad strcmp params. +#include <cstddef> #include <cstdint> #include <cstring> -#include <cstddef> static volatile int Sink; diff --git a/lib/Fuzzer/test/BufferOverflowOnInput.cpp b/lib/Fuzzer/test/BufferOverflowOnInput.cpp index b9d14052aee47..75e1fb90a19a8 100644 --- a/lib/Fuzzer/test/BufferOverflowOnInput.cpp +++ b/lib/Fuzzer/test/BufferOverflowOnInput.cpp @@ -3,9 +3,9 @@ // Simple test for a fuzzer. The fuzzer must find the string "Hi!". #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> static volatile bool SeedLargeBuffer; diff --git a/lib/Fuzzer/test/CallerCalleeTest.cpp b/lib/Fuzzer/test/CallerCalleeTest.cpp index 3ec025d02301d..ed9f37cc15218 100644 --- a/lib/Fuzzer/test/CallerCalleeTest.cpp +++ b/lib/Fuzzer/test/CallerCalleeTest.cpp @@ -3,9 +3,9 @@ // Simple test for a fuzzer. // Try to find the target using the indirect caller-callee pairs. +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <cstring> #include <iostream> diff --git a/lib/Fuzzer/test/CleanseTest.cpp b/lib/Fuzzer/test/CleanseTest.cpp index faea8dcb3c30c..ee18457012693 100644 --- a/lib/Fuzzer/test/CleanseTest.cpp +++ b/lib/Fuzzer/test/CleanseTest.cpp @@ -3,9 +3,9 @@ // Test the the fuzzer is able to 'cleanse' the reproducer // by replacing all irrelevant bytes with garbage. +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { if (Size >= 20 && Data[1] == '1' && Data[5] == '5' && Data[10] == 'A' && diff --git a/lib/Fuzzer/test/CustomMutatorTest.cpp b/lib/Fuzzer/test/CustomMutatorTest.cpp index 4f84519a90e64..521d7f506b4d3 100644 --- a/lib/Fuzzer/test/CustomMutatorTest.cpp +++ b/lib/Fuzzer/test/CustomMutatorTest.cpp @@ -3,9 +3,9 @@ // Simple test for a cutom mutator. #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> #include "FuzzerInterface.h" diff --git a/lib/Fuzzer/test/CxxStringEqTest.cpp b/lib/Fuzzer/test/CxxStringEqTest.cpp index e0e23c972ccba..924851c5ad536 100644 --- a/lib/Fuzzer/test/CxxStringEqTest.cpp +++ b/lib/Fuzzer/test/CxxStringEqTest.cpp @@ -3,11 +3,11 @@ // Simple test for a fuzzer. Must find a specific string // used in std::string operator ==. +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> -#include <string> #include <iostream> +#include <string> static volatile int Sink; diff --git a/lib/Fuzzer/test/DSOTestMain.cpp b/lib/Fuzzer/test/DSOTestMain.cpp index 3e225d8861289..e0c857d4fdec3 100644 --- a/lib/Fuzzer/test/DSOTestMain.cpp +++ b/lib/Fuzzer/test/DSOTestMain.cpp @@ -4,9 +4,9 @@ // Source code for a simple DSO. #include <cstdint> +#include <cstdio> #include <cstdlib> #include <cstring> -#include <cstdio> extern int DSO1(int a); extern int DSO2(int a); extern int DSOTestExtra(int a); diff --git a/lib/Fuzzer/test/DivTest.cpp b/lib/Fuzzer/test/DivTest.cpp index 63f6960f4e909..bce13feb790f0 100644 --- a/lib/Fuzzer/test/DivTest.cpp +++ b/lib/Fuzzer/test/DivTest.cpp @@ -3,9 +3,9 @@ // Simple test for a fuzzer: find the interesting argument for div. #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstring> -#include <cstddef> #include <iostream> static volatile int Sink; diff --git a/lib/Fuzzer/test/FourIndependentBranchesTest.cpp b/lib/Fuzzer/test/FourIndependentBranchesTest.cpp index 62b3be76e3aa5..bbf5ea235c7af 100644 --- a/lib/Fuzzer/test/FourIndependentBranchesTest.cpp +++ b/lib/Fuzzer/test/FourIndependentBranchesTest.cpp @@ -2,9 +2,9 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find the string "FUZZ". +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { diff --git a/lib/Fuzzer/test/FullCoverageSetTest.cpp b/lib/Fuzzer/test/FullCoverageSetTest.cpp index 415e0b4760c50..6d7e48fe51f8b 100644 --- a/lib/Fuzzer/test/FullCoverageSetTest.cpp +++ b/lib/Fuzzer/test/FullCoverageSetTest.cpp @@ -2,9 +2,9 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find the string "FUZZER". +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { diff --git a/lib/Fuzzer/test/FuzzerUnittest.cpp b/lib/Fuzzer/test/FuzzerUnittest.cpp index 78ea874f2ce23..c8beb4331bfa7 100644 --- a/lib/Fuzzer/test/FuzzerUnittest.cpp +++ b/lib/Fuzzer/test/FuzzerUnittest.cpp @@ -6,12 +6,12 @@ #define _LIBCPP_HAS_NO_ASAN #include "FuzzerCorpus.h" -#include "FuzzerInternal.h" #include "FuzzerDictionary.h" +#include "FuzzerInternal.h" #include "FuzzerMerge.h" #include "FuzzerMutate.h" -#include "FuzzerTracePC.h" #include "FuzzerRandom.h" +#include "FuzzerTracePC.h" #include "gtest/gtest.h" #include <memory> #include <set> diff --git a/lib/Fuzzer/test/LeakTest.cpp b/lib/Fuzzer/test/LeakTest.cpp index 22e5164050e51..ea89e39010573 100644 --- a/lib/Fuzzer/test/LeakTest.cpp +++ b/lib/Fuzzer/test/LeakTest.cpp @@ -2,8 +2,8 @@ // License. See LICENSE.TXT for details. // Test with a leak. -#include <cstdint> #include <cstddef> +#include <cstdint> static volatile void *Sink; diff --git a/lib/Fuzzer/test/LeakTimeoutTest.cpp b/lib/Fuzzer/test/LeakTimeoutTest.cpp index 4f31b3e52c165..92526194a508a 100644 --- a/lib/Fuzzer/test/LeakTimeoutTest.cpp +++ b/lib/Fuzzer/test/LeakTimeoutTest.cpp @@ -2,8 +2,8 @@ // License. See LICENSE.TXT for details. // Test with a leak. -#include <cstdint> #include <cstddef> +#include <cstdint> static volatile int *Sink; diff --git a/lib/Fuzzer/test/LoadTest.cpp b/lib/Fuzzer/test/LoadTest.cpp index eef16c7be51ee..67a28c7cb22ff 100644 --- a/lib/Fuzzer/test/LoadTest.cpp +++ b/lib/Fuzzer/test/LoadTest.cpp @@ -3,9 +3,9 @@ // Simple test for a fuzzer: find interesting value of array index. #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstring> -#include <cstddef> #include <iostream> static volatile int Sink; diff --git a/lib/Fuzzer/test/Memcmp64BytesTest.cpp b/lib/Fuzzer/test/Memcmp64BytesTest.cpp index e81526b578a36..5b6cb707173f2 100644 --- a/lib/Fuzzer/test/Memcmp64BytesTest.cpp +++ b/lib/Fuzzer/test/Memcmp64BytesTest.cpp @@ -3,10 +3,10 @@ // Simple test for a fuzzer. The fuzzer must find a particular string. #include <cassert> -#include <cstring> #include <cstdint> #include <cstdio> #include <cstdlib> +#include <cstring> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { const char kString64Bytes[] = diff --git a/lib/Fuzzer/test/MemcmpTest.cpp b/lib/Fuzzer/test/MemcmpTest.cpp index fdbf94683f765..8dbb7d84fbbaf 100644 --- a/lib/Fuzzer/test/MemcmpTest.cpp +++ b/lib/Fuzzer/test/MemcmpTest.cpp @@ -2,10 +2,10 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find a particular string. -#include <cstring> #include <cstdint> #include <cstdio> #include <cstdlib> +#include <cstring> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { // TODO: check other sizes. diff --git a/lib/Fuzzer/test/NotinstrumentedTest.cpp b/lib/Fuzzer/test/NotinstrumentedTest.cpp index ffe952c749d22..91418990b1922 100644 --- a/lib/Fuzzer/test/NotinstrumentedTest.cpp +++ b/lib/Fuzzer/test/NotinstrumentedTest.cpp @@ -2,8 +2,8 @@ // License. See LICENSE.TXT for details. // This test should not be instrumented. -#include <cstdint> #include <cstddef> +#include <cstdint> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { return 0; diff --git a/lib/Fuzzer/test/NthRunCrashTest.cpp b/lib/Fuzzer/test/NthRunCrashTest.cpp index b43e69e51b256..da5fbd33e9626 100644 --- a/lib/Fuzzer/test/NthRunCrashTest.cpp +++ b/lib/Fuzzer/test/NthRunCrashTest.cpp @@ -2,8 +2,8 @@ // License. See LICENSE.TXT for details. // Crash on the N-th execution. -#include <cstdint> #include <cstddef> +#include <cstdint> #include <iostream> static int Counter; diff --git a/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp b/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp index 153710920a5fd..459db51f8a3b8 100644 --- a/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp +++ b/lib/Fuzzer/test/NullDerefOnEmptyTest.cpp @@ -2,9 +2,9 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find the empty string. +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> static volatile int *Null = 0; diff --git a/lib/Fuzzer/test/NullDerefTest.cpp b/lib/Fuzzer/test/NullDerefTest.cpp index 3f03d24981972..1b44b682ace68 100644 --- a/lib/Fuzzer/test/NullDerefTest.cpp +++ b/lib/Fuzzer/test/NullDerefTest.cpp @@ -2,9 +2,9 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find the string "Hi!". +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> static volatile int Sink; diff --git a/lib/Fuzzer/test/OneHugeAllocTest.cpp b/lib/Fuzzer/test/OneHugeAllocTest.cpp index 8d3d1d6d302dc..32a5578710008 100644 --- a/lib/Fuzzer/test/OneHugeAllocTest.cpp +++ b/lib/Fuzzer/test/OneHugeAllocTest.cpp @@ -3,9 +3,9 @@ // Tests OOM handling when there is a single large allocation. #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <cstring> #include <iostream> diff --git a/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp b/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp index 316b7682b8e60..a07795a08dffa 100644 --- a/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp +++ b/lib/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp @@ -3,9 +3,9 @@ // Tests OOM handling. #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <cstring> #include <iostream> diff --git a/lib/Fuzzer/test/OutOfMemoryTest.cpp b/lib/Fuzzer/test/OutOfMemoryTest.cpp index 078a39ee1fe94..5e59bde09853f 100644 --- a/lib/Fuzzer/test/OutOfMemoryTest.cpp +++ b/lib/Fuzzer/test/OutOfMemoryTest.cpp @@ -3,9 +3,9 @@ // Tests OOM handling. #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <cstring> #include <iostream> #include <thread> diff --git a/lib/Fuzzer/test/RepeatedBytesTest.cpp b/lib/Fuzzer/test/RepeatedBytesTest.cpp index 2fa6c78c26d82..14222f2847472 100644 --- a/lib/Fuzzer/test/RepeatedBytesTest.cpp +++ b/lib/Fuzzer/test/RepeatedBytesTest.cpp @@ -3,9 +3,9 @@ // Simple test for a fuzzer. The fuzzer must find repeated bytes. #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { diff --git a/lib/Fuzzer/test/RepeatedMemcmp.cpp b/lib/Fuzzer/test/RepeatedMemcmp.cpp index 7377f65ed76de..18369deac3b00 100644 --- a/lib/Fuzzer/test/RepeatedMemcmp.cpp +++ b/lib/Fuzzer/test/RepeatedMemcmp.cpp @@ -1,11 +1,10 @@ // This file is distributed under the University of Illinois Open Source // License. See LICENSE.TXT for details. - -#include <cstring> #include <cstdint> #include <cstdio> #include <cstdlib> +#include <cstring> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { int Matches1 = 0; diff --git a/lib/Fuzzer/test/ShrinkControlFlowTest.cpp b/lib/Fuzzer/test/ShrinkControlFlowTest.cpp index 0fd7c5e9a1fbf..d095429636266 100644 --- a/lib/Fuzzer/test/ShrinkControlFlowTest.cpp +++ b/lib/Fuzzer/test/ShrinkControlFlowTest.cpp @@ -2,11 +2,11 @@ // License. See LICENSE.TXT for details. // Test that we can find the minimal item in the corpus (3 bytes: "FUZ"). +#include <cstddef> #include <cstdint> +#include <cstdio> #include <cstdlib> -#include <cstddef> #include <cstring> -#include <cstdio> static volatile int Sink; diff --git a/lib/Fuzzer/test/ShrinkValueProfileTest.cpp b/lib/Fuzzer/test/ShrinkValueProfileTest.cpp index 026b8ce26591f..86e4e3cb0d9ae 100644 --- a/lib/Fuzzer/test/ShrinkValueProfileTest.cpp +++ b/lib/Fuzzer/test/ShrinkValueProfileTest.cpp @@ -2,11 +2,11 @@ // License. See LICENSE.TXT for details. // Test that we can find the minimal item in the corpus (3 bytes: "FUZ"). +#include <cstddef> #include <cstdint> +#include <cstdio> #include <cstdlib> -#include <cstddef> #include <cstring> -#include <cstdio> static volatile uint32_t Sink; diff --git a/lib/Fuzzer/test/SignedIntOverflowTest.cpp b/lib/Fuzzer/test/SignedIntOverflowTest.cpp index 7df32ad57933d..d80060207dee1 100644 --- a/lib/Fuzzer/test/SignedIntOverflowTest.cpp +++ b/lib/Fuzzer/test/SignedIntOverflowTest.cpp @@ -3,11 +3,11 @@ // Test for signed-integer-overflow. #include <assert.h> +#include <climits> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> -#include <climits> static volatile int Sink; static int Large = INT_MAX; diff --git a/lib/Fuzzer/test/SimpleCmpTest.cpp b/lib/Fuzzer/test/SimpleCmpTest.cpp index 12b5cdda06607..8acad4ac77e8f 100644 --- a/lib/Fuzzer/test/SimpleCmpTest.cpp +++ b/lib/Fuzzer/test/SimpleCmpTest.cpp @@ -3,9 +3,9 @@ // Simple test for a fuzzer. The fuzzer must find several narrow ranges. #include <cstdint> +#include <cstdio> #include <cstdlib> #include <cstring> -#include <cstdio> extern int AllLines[]; diff --git a/lib/Fuzzer/test/SimpleDictionaryTest.cpp b/lib/Fuzzer/test/SimpleDictionaryTest.cpp index cd7292bd006c8..a1cd200472249 100644 --- a/lib/Fuzzer/test/SimpleDictionaryTest.cpp +++ b/lib/Fuzzer/test/SimpleDictionaryTest.cpp @@ -5,9 +5,9 @@ // The fuzzer must find a string based on dictionary words: // "Elvis" // "Presley" +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <cstring> #include <iostream> diff --git a/lib/Fuzzer/test/SimpleHashTest.cpp b/lib/Fuzzer/test/SimpleHashTest.cpp index 00599de78ebed..99e96cb25dcd5 100644 --- a/lib/Fuzzer/test/SimpleHashTest.cpp +++ b/lib/Fuzzer/test/SimpleHashTest.cpp @@ -5,9 +5,9 @@ // and then compares the last 4 bytes with the computed value. // A fuzzer with cmp traces is expected to defeat this check. #include <cstdint> +#include <cstdio> #include <cstdlib> #include <cstring> -#include <cstdio> // A modified jenkins_one_at_a_time_hash initialized by non-zero, // so that simple_hash(0) != 0. See also diff --git a/lib/Fuzzer/test/SimpleTest.cpp b/lib/Fuzzer/test/SimpleTest.cpp index e53ea160ed8fb..a8b4988dff10e 100644 --- a/lib/Fuzzer/test/SimpleTest.cpp +++ b/lib/Fuzzer/test/SimpleTest.cpp @@ -3,9 +3,9 @@ // Simple test for a fuzzer. The fuzzer must find the string "Hi!". #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> static volatile int Sink; diff --git a/lib/Fuzzer/test/SimpleThreadedTest.cpp b/lib/Fuzzer/test/SimpleThreadedTest.cpp index 5f02d3f8457cb..1abdc3fc6d6be 100644 --- a/lib/Fuzzer/test/SimpleThreadedTest.cpp +++ b/lib/Fuzzer/test/SimpleThreadedTest.cpp @@ -3,8 +3,8 @@ // Threaded test for a fuzzer. The fuzzer should find "H" #include <assert.h> -#include <cstdint> #include <cstddef> +#include <cstdint> #include <cstring> #include <iostream> #include <thread> diff --git a/lib/Fuzzer/test/SingleByteInputTest.cpp b/lib/Fuzzer/test/SingleByteInputTest.cpp index 4ce819d230cec..72b58ba912eb3 100644 --- a/lib/Fuzzer/test/SingleByteInputTest.cpp +++ b/lib/Fuzzer/test/SingleByteInputTest.cpp @@ -2,10 +2,10 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer, need just one byte to crash. -#include <cstdint> -#include <cstdlib> #include <cstddef> +#include <cstdint> #include <cstdio> +#include <cstdlib> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { if (Size > 0 && Data[Size/2] == 42) { diff --git a/lib/Fuzzer/test/SingleMemcmpTest.cpp b/lib/Fuzzer/test/SingleMemcmpTest.cpp index c73f68a7ee6e2..83c09e0428ec1 100644 --- a/lib/Fuzzer/test/SingleMemcmpTest.cpp +++ b/lib/Fuzzer/test/SingleMemcmpTest.cpp @@ -2,10 +2,10 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find a particular string. -#include <cstring> #include <cstdint> #include <cstdio> #include <cstdlib> +#include <cstring> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { char *S = (char*)Data; diff --git a/lib/Fuzzer/test/SingleStrcmpTest.cpp b/lib/Fuzzer/test/SingleStrcmpTest.cpp index 48f481dfc51ae..149073444c9cb 100644 --- a/lib/Fuzzer/test/SingleStrcmpTest.cpp +++ b/lib/Fuzzer/test/SingleStrcmpTest.cpp @@ -2,10 +2,10 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find a particular string. -#include <cstring> #include <cstdint> #include <cstdio> #include <cstdlib> +#include <cstring> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { if (Size >= 7) { diff --git a/lib/Fuzzer/test/SingleStrncmpTest.cpp b/lib/Fuzzer/test/SingleStrncmpTest.cpp index e5601da863299..b302670fb743e 100644 --- a/lib/Fuzzer/test/SingleStrncmpTest.cpp +++ b/lib/Fuzzer/test/SingleStrncmpTest.cpp @@ -2,10 +2,10 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find a particular string. -#include <cstring> #include <cstdint> #include <cstdio> #include <cstdlib> +#include <cstring> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { char *S = (char*)Data; diff --git a/lib/Fuzzer/test/SpamyTest.cpp b/lib/Fuzzer/test/SpamyTest.cpp index d294d4dc53e0c..721134e1841c3 100644 --- a/lib/Fuzzer/test/SpamyTest.cpp +++ b/lib/Fuzzer/test/SpamyTest.cpp @@ -3,9 +3,9 @@ // The test spams to stderr and stdout. #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdio> -#include <cstddef> #include <iostream> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { diff --git a/lib/Fuzzer/test/StrcmpTest.cpp b/lib/Fuzzer/test/StrcmpTest.cpp index cd91dda76f30d..e7636e8812fcd 100644 --- a/lib/Fuzzer/test/StrcmpTest.cpp +++ b/lib/Fuzzer/test/StrcmpTest.cpp @@ -2,11 +2,11 @@ // License. See LICENSE.TXT for details. // Break through a series of strcmp. -#include <cstring> +#include <cassert> #include <cstdint> #include <cstdio> #include <cstdlib> -#include <cassert> +#include <cstring> bool Eq(const uint8_t *Data, size_t Size, const char *Str) { char Buff[1024]; diff --git a/lib/Fuzzer/test/StrncmpOOBTest.cpp b/lib/Fuzzer/test/StrncmpOOBTest.cpp index f70b003afad65..4ed71d9d021dd 100644 --- a/lib/Fuzzer/test/StrncmpOOBTest.cpp +++ b/lib/Fuzzer/test/StrncmpOOBTest.cpp @@ -3,10 +3,10 @@ // Test that libFuzzer itself does not read out of bounds. #include <assert.h> +#include <cstddef> #include <cstdint> -#include <cstring> #include <cstdlib> -#include <cstddef> +#include <cstring> #include <iostream> static volatile int Sink; diff --git a/lib/Fuzzer/test/StrncmpTest.cpp b/lib/Fuzzer/test/StrncmpTest.cpp index 5ffd011dcdfff..f71f01ee3098c 100644 --- a/lib/Fuzzer/test/StrncmpTest.cpp +++ b/lib/Fuzzer/test/StrncmpTest.cpp @@ -2,10 +2,10 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find a particular string. -#include <cstring> #include <cstdint> #include <cstdio> #include <cstdlib> +#include <cstring> static volatile int sink; diff --git a/lib/Fuzzer/test/StrstrTest.cpp b/lib/Fuzzer/test/StrstrTest.cpp index f021e75ec0fde..a3ea4e03b3d27 100644 --- a/lib/Fuzzer/test/StrstrTest.cpp +++ b/lib/Fuzzer/test/StrstrTest.cpp @@ -2,11 +2,11 @@ // License. See LICENSE.TXT for details. // Test strstr and strcasestr hooks. -#include <string> -#include <string.h> #include <cstdint> #include <cstdio> #include <cstdlib> +#include <string.h> +#include <string> // Windows does not have strcasestr and memmem, so we are not testing them. #ifdef _WIN32 diff --git a/lib/Fuzzer/test/SwapCmpTest.cpp b/lib/Fuzzer/test/SwapCmpTest.cpp index b90ac72c22c4b..bbfbefe6ab710 100644 --- a/lib/Fuzzer/test/SwapCmpTest.cpp +++ b/lib/Fuzzer/test/SwapCmpTest.cpp @@ -3,9 +3,9 @@ // The fuzzer must find several constants with swapped bytes. #include <cstdint> +#include <cstdio> #include <cstdlib> #include <cstring> -#include <cstdio> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { if (Size < 14) return 0; diff --git a/lib/Fuzzer/test/Switch2Test.cpp b/lib/Fuzzer/test/Switch2Test.cpp index 3c6a3004907e1..5f66ac8b499e6 100644 --- a/lib/Fuzzer/test/Switch2Test.cpp +++ b/lib/Fuzzer/test/Switch2Test.cpp @@ -2,11 +2,11 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find the interesting switch value. +#include <cstddef> #include <cstdint> -#include <cstdlib> #include <cstdio> +#include <cstdlib> #include <cstring> -#include <cstddef> int Switch(int a) { switch(a) { diff --git a/lib/Fuzzer/test/SwitchTest.cpp b/lib/Fuzzer/test/SwitchTest.cpp index 3dc051ff7b5b1..86944cad21c5f 100644 --- a/lib/Fuzzer/test/SwitchTest.cpp +++ b/lib/Fuzzer/test/SwitchTest.cpp @@ -2,11 +2,11 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find the interesting switch value. +#include <cstddef> #include <cstdint> -#include <cstdlib> #include <cstdio> +#include <cstdlib> #include <cstring> -#include <cstddef> static volatile int Sink; diff --git a/lib/Fuzzer/test/TableLookupTest.cpp b/lib/Fuzzer/test/TableLookupTest.cpp index f9d5610820ff5..8126eeabaf429 100644 --- a/lib/Fuzzer/test/TableLookupTest.cpp +++ b/lib/Fuzzer/test/TableLookupTest.cpp @@ -3,11 +3,11 @@ // Make sure the fuzzer eventually finds all possible values of a variable // within a range. -#include <cstring> +#include <cassert> #include <cstdint> #include <cstdio> #include <cstdlib> -#include <cassert> +#include <cstring> #include <set> const size_t N = 1 << 12; diff --git a/lib/Fuzzer/test/ThreadedLeakTest.cpp b/lib/Fuzzer/test/ThreadedLeakTest.cpp index 7511071108712..538d3b434808e 100644 --- a/lib/Fuzzer/test/ThreadedLeakTest.cpp +++ b/lib/Fuzzer/test/ThreadedLeakTest.cpp @@ -2,8 +2,8 @@ // License. See LICENSE.TXT for details. // The fuzzer should find a leak in a non-main thread. -#include <cstdint> #include <cstddef> +#include <cstdint> #include <thread> static volatile int *Sink; diff --git a/lib/Fuzzer/test/ThreadedTest.cpp b/lib/Fuzzer/test/ThreadedTest.cpp index 09137a9a70c17..bb51ba764ebaf 100644 --- a/lib/Fuzzer/test/ThreadedTest.cpp +++ b/lib/Fuzzer/test/ThreadedTest.cpp @@ -3,8 +3,8 @@ // Threaded test for a fuzzer. The fuzzer should not crash. #include <assert.h> -#include <cstdint> #include <cstddef> +#include <cstdint> #include <cstring> #include <thread> diff --git a/lib/Fuzzer/test/TimeoutEmptyTest.cpp b/lib/Fuzzer/test/TimeoutEmptyTest.cpp index 8066f480b6550..1ddf1fa34589a 100644 --- a/lib/Fuzzer/test/TimeoutEmptyTest.cpp +++ b/lib/Fuzzer/test/TimeoutEmptyTest.cpp @@ -2,8 +2,8 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find the empty string. -#include <cstdint> #include <cstddef> +#include <cstdint> extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { static volatile int Zero = 0; diff --git a/lib/Fuzzer/test/TimeoutTest.cpp b/lib/Fuzzer/test/TimeoutTest.cpp index f8107012c841f..e3cdba3eec382 100644 --- a/lib/Fuzzer/test/TimeoutTest.cpp +++ b/lib/Fuzzer/test/TimeoutTest.cpp @@ -2,9 +2,9 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. The fuzzer must find the string "Hi!". +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> static volatile int Sink; diff --git a/lib/Fuzzer/test/TraceMallocTest.cpp b/lib/Fuzzer/test/TraceMallocTest.cpp index 43e6950e185f3..af9975603aa18 100644 --- a/lib/Fuzzer/test/TraceMallocTest.cpp +++ b/lib/Fuzzer/test/TraceMallocTest.cpp @@ -3,9 +3,9 @@ // Tests -trace_malloc #include <assert.h> +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> int *Ptr; diff --git a/lib/Fuzzer/test/TwoDifferentBugsTest.cpp b/lib/Fuzzer/test/TwoDifferentBugsTest.cpp index 42c0d192ba866..77d2cb1a25f9f 100644 --- a/lib/Fuzzer/test/TwoDifferentBugsTest.cpp +++ b/lib/Fuzzer/test/TwoDifferentBugsTest.cpp @@ -2,9 +2,9 @@ // License. See LICENSE.TXT for details. // Simple test for a fuzzer. This test may trigger two different bugs. +#include <cstddef> #include <cstdint> #include <cstdlib> -#include <cstddef> #include <iostream> static volatile int *Null = 0; |