From 87e6608466b9e6a999035a0aefe0d6338f0c1289 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Fri, 4 Sep 2015 22:32:25 +0000 Subject: [PATCH] [libFuzzer] more accurate logic for traces, 80-char fix git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@246888 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Fuzzer/FuzzerTraceState.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/Fuzzer/FuzzerTraceState.cpp b/lib/Fuzzer/FuzzerTraceState.cpp index 2e57e259e14..b7ed66fdfc6 100644 --- a/lib/Fuzzer/FuzzerTraceState.cpp +++ b/lib/Fuzzer/FuzzerTraceState.cpp @@ -216,8 +216,8 @@ class TraceState { dfsan_label L2); void DFSanSwitchCallback(uint64_t PC, size_t ValSizeInBits, uint64_t Val, size_t NumCases, uint64_t *Cases, dfsan_label L); - void TraceCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, uint64_t Arg1, - uint64_t Arg2); + void TraceCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, + uint64_t Arg1, uint64_t Arg2); void TraceSwitchCallback(uintptr_t PC, size_t ValSizeInBits, uint64_t Val, size_t NumCases, uint64_t *Cases); @@ -330,7 +330,7 @@ int TraceState::TryToAddDesiredData(uint64_t PresentData, uint64_t DesiredData, int Res = 0; const uint8_t *Beg = CurrentUnit.data(); const uint8_t *End = Beg + CurrentUnit.size(); - for (const uint8_t *Cur = Beg; Cur < End; Cur += DataSize) { + for (const uint8_t *Cur = Beg; Cur < End; Cur++) { Cur = (uint8_t *)memmem(Cur, End - Cur, &PresentData, DataSize); if (!Cur) break; @@ -340,14 +340,13 @@ int TraceState::TryToAddDesiredData(uint64_t PresentData, uint64_t DesiredData, Mutations.push_back({Pos, DataSize, DesiredData}); Mutations.push_back({Pos, DataSize, DesiredData + 1}); Mutations.push_back({Pos, DataSize, DesiredData - 1}); - Cur += DataSize; Res++; } return Res; } -void TraceState::TraceCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, uint64_t Arg1, - uint64_t Arg2) { +void TraceState::TraceCmpCallback(uintptr_t PC, size_t CmpSize, size_t CmpType, + uint64_t Arg1, uint64_t Arg2) { if (!RecordingTraces) return; int Added = 0; CmpSitePassport *CSP = CSPTable.GetPassport(PC); -- 2.34.1