diff options
author | Robert Swiecki <robert@swiecki.net> | 2017-09-28 18:11:05 +0200 |
---|---|---|
committer | Robert Swiecki <robert@swiecki.net> | 2017-09-28 18:11:05 +0200 |
commit | d0fa62c5606ba9caf914b4db031d22d9551d16ba (patch) | |
tree | fca6ce7a841b3a179e6218af316ad614fd2c3393 /fuzz.c | |
parent | 81f166220ef5187525e5b56d8882cdfa8fa5c87e (diff) | |
download | honggfuzz-d0fa62c5606ba9caf914b4db031d22d9551d16ba.tar.gz |
make indent with clang-format
Diffstat (limited to 'fuzz.c')
-rw-r--r-- | fuzz.c | 56 |
1 files changed, 27 insertions, 29 deletions
@@ -44,13 +44,13 @@ #include <time.h> #include <unistd.h> +#include "arch.h" +#include "honggfuzz.h" +#include "input.h" #include "libcommon/common.h" #include "libcommon/files.h" #include "libcommon/log.h" #include "libcommon/util.h" -#include "arch.h" -#include "honggfuzz.h" -#include "input.h" #include "mangle.h" #include "report.h" #include "sancov.h" @@ -92,9 +92,10 @@ static bool fuzz_prepareFileDynamically(honggfuzz_t * hfuzz, fuzzer_t * fuzzer) mangle_mangleContent(hfuzz, fuzzer); - if (hfuzz->persistent == false && files_writeBufToFile - (fuzzer->fileName, fuzzer->dynamicFile, fuzzer->dynamicFileSz, - O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC) == false) { + if (hfuzz->persistent == false + && files_writeBufToFile(fuzzer->fileName, fuzzer->dynamicFile, fuzzer->dynamicFileSz, + O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC) + == false) { LOG_E("Couldn't write buffer to file '%s'", fuzzer->fileName); return false; } @@ -119,9 +120,10 @@ static bool fuzz_prepareFile(honggfuzz_t * hfuzz, fuzzer_t * fuzzer, bool rewind mangle_mangleContent(hfuzz, fuzzer); - if (hfuzz->persistent == false && files_writeBufToFile - (fuzzer->fileName, fuzzer->dynamicFile, fuzzer->dynamicFileSz, - O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC) == false) { + if (hfuzz->persistent == false + && files_writeBufToFile(fuzzer->fileName, fuzzer->dynamicFile, fuzzer->dynamicFileSz, + O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC) + == false) { LOG_E("Couldn't write buffer to file '%s'", fuzzer->fileName); return false; } @@ -174,9 +176,9 @@ static bool fuzz_prepareFileExternally(honggfuzz_t * hfuzz, fuzzer_t * fuzzer) static bool fuzz_postProcessFile(honggfuzz_t * hfuzz, fuzzer_t * fuzzer) { if (hfuzz->persistent) { - if (files_writeBufToFile - (fuzzer->fileName, fuzzer->dynamicFile, fuzzer->dynamicFileSz, - O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC) == false) { + if (files_writeBufToFile(fuzzer->fileName, fuzzer->dynamicFile, fuzzer->dynamicFileSz, + O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC) + == false) { LOG_E("Couldn't write file to '%s'", fuzzer->fileName); return false; } @@ -306,9 +308,9 @@ static bool fuzz_runVerifier(honggfuzz_t * hfuzz, fuzzer_t * crashedFuzzer) } fuzz_getFileName(hfuzz, &vFuzzer); - if (files_writeBufToFile - (vFuzzer.fileName, crashBuf, crashFileSz, - O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC) == false) { + if (files_writeBufToFile(vFuzzer.fileName, crashBuf, crashFileSz, + O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC) + == false) { LOG_E("Couldn't write buffer to file '%s'", vFuzzer.fileName); return false; } @@ -380,9 +382,8 @@ static void fuzz_addFileToFileQ(honggfuzz_t * hfuzz, fuzzer_t * fuzzer) LOG_D("Adding file '%s' to the corpus directory", fname); - if (files_writeBufToFile - (fname, fuzzer->dynamicFile, fuzzer->dynamicFileSz, - O_WRONLY | O_CREAT | O_EXCL | O_TRUNC | O_CLOEXEC) + if (files_writeBufToFile(fname, fuzzer->dynamicFile, fuzzer->dynamicFileSz, + O_WRONLY | O_CREAT | O_EXCL | O_TRUNC | O_CLOEXEC) == false) { LOG_W("Couldn't write buffer to file '%s'", fname); } @@ -435,10 +436,9 @@ static void fuzz_perfFeedback(honggfuzz_t * hfuzz, fuzzer_t * fuzzer) hfuzz->linux.hwCnts.softCntEdge += softCntEdge; hfuzz->linux.hwCnts.softCntCmp += softCntCmp; - LOG_I("Size:%zu (i,b,edg,ip,hw,cmp): %" PRIu64 "/%" - PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64 ", Tot:%" PRIu64 - "/%" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64, - fuzzer->dynamicFileSz, fuzzer->linux.hwCnts.cpuInstrCnt, + LOG_I("Size:%zu (i,b,edg,ip,hw,cmp): %" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" + PRIu64 "/%" PRIu64 ", Tot:%" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64 "/%" PRIu64 + "/%" PRIu64, fuzzer->dynamicFileSz, fuzzer->linux.hwCnts.cpuInstrCnt, fuzzer->linux.hwCnts.cpuBranchCnt, softCntEdge, softCntPc, fuzzer->linux.hwCnts.newBBCnt, softCntCmp, hfuzz->linux.hwCnts.cpuInstrCnt, hfuzz->linux.hwCnts.cpuBranchCnt, hfuzz->linux.hwCnts.softCntEdge, @@ -455,12 +455,11 @@ static void fuzz_sanCovFeedback(honggfuzz_t * hfuzz, fuzzer_t * fuzzer) return; } - LOG_D - ("File size (Best/New): %zu, SanCov feedback (bb,dso): Best: [%" PRIu64 - ",%" PRIu64 "] / New: [%" PRIu64 ",%" PRIu64 "], newBBs:%" PRIu64, - fuzzer->dynamicFileSz, hfuzz->sanCovCnts.hitBBCnt, - hfuzz->sanCovCnts.iDsoCnt, fuzzer->sanCovCnts.hitBBCnt, fuzzer->sanCovCnts.iDsoCnt, - fuzzer->sanCovCnts.newBBCnt); + LOG_D("File size (Best/New): %zu, SanCov feedback (bb,dso): Best: [%" PRIu64 + ",%" PRIu64 "] / New: [%" PRIu64 ",%" PRIu64 "], newBBs:%" PRIu64, + fuzzer->dynamicFileSz, hfuzz->sanCovCnts.hitBBCnt, + hfuzz->sanCovCnts.iDsoCnt, fuzzer->sanCovCnts.hitBBCnt, fuzzer->sanCovCnts.iDsoCnt, + fuzzer->sanCovCnts.newBBCnt); MX_SCOPED_LOCK(&hfuzz->feedback_mutex); @@ -655,7 +654,6 @@ static void *fuzz_threadNew(void *arg) ATOMIC_SET(hfuzz->terminating, true); break; } - } LOG_I("Terminating thread no. #%" PRId32, fuzzNo); |