ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-17 04:18:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

code format

Browse Source
This commit is contained in:
Andrea Fioraldi
2021-03-04 11:33:51 +01:00
parent 1e76079e93
commit 8f538e77ed
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
instrumentation/afl-llvm-pass.so.cc
View File

@ -356,9 +356,8 @@ bool AFLCoverage::runOnModule(Module &M) {
if (has_calls) { if (has_calls) {
Value *NewCtx = ConstantInt::get(Int32Ty, AFL_R(map_size)); Value *NewCtx = ConstantInt::get(Int32Ty, AFL_R(map_size));
if (ctx_str) if (ctx_str) NewCtx = IRB.CreateXor(PrevCtx, NewCtx);
NewCtx = IRB.CreateXor(PrevCtx, NewCtx); StoreInst *StoreCtx = IRB.CreateStore(NewCtx, AFLContext);
StoreInst * StoreCtx = IRB.CreateStore(NewCtx, AFLContext);
StoreCtx->setMetadata(M.getMDKindID("nosanitize"), StoreCtx->setMetadata(M.getMDKindID("nosanitize"),
MDNode::get(C, None)); MDNode::get(C, None));

16
src/afl-cc.c
View File

@ -1275,7 +1275,7 @@ int main(int argc, char **argv, char **envp) {
if (getenv("AFL_LLVM_CTX")) instrument_opt_mode |= INSTRUMENT_OPT_CTX; if (getenv("AFL_LLVM_CTX")) instrument_opt_mode |= INSTRUMENT_OPT_CTX;
if (getenv("AFL_LLVM_CALLER")) instrument_opt_mode |= INSTRUMENT_OPT_CALLER; if (getenv("AFL_LLVM_CALLER")) instrument_opt_mode |= INSTRUMENT_OPT_CALLER;
if (getenv("AFL_LLVM_NGRAM_SIZE")) { if (getenv("AFL_LLVM_NGRAM_SIZE")) {
instrument_opt_mode |= INSTRUMENT_OPT_NGRAM; instrument_opt_mode |= INSTRUMENT_OPT_NGRAM;
@ -1389,7 +1389,7 @@ int main(int argc, char **argv, char **envp) {
setenv("AFL_LLVM_CTX", "1", 1); setenv("AFL_LLVM_CTX", "1", 1);
} }
if (strncasecmp(ptr2, "caller", strlen("caller")) == 0) { if (strncasecmp(ptr2, "caller", strlen("caller")) == 0) {
instrument_opt_mode |= INSTRUMENT_OPT_CALLER; instrument_opt_mode |= INSTRUMENT_OPT_CALLER;
@ -1429,10 +1429,12 @@ int main(int argc, char **argv, char **envp) {
} }
} }
if ((instrument_opt_mode & INSTRUMENT_OPT_CTX) && if ((instrument_opt_mode & INSTRUMENT_OPT_CTX) &&
(instrument_opt_mode & INSTRUMENT_OPT_CALLER)) { (instrument_opt_mode & INSTRUMENT_OPT_CALLER)) {
FATAL("you cannot set CTX and CALLER together"); FATAL("you cannot set CTX and CALLER together");
} }
if (instrument_opt_mode && instrument_mode == INSTRUMENT_DEFAULT && if (instrument_opt_mode && instrument_mode == INSTRUMENT_DEFAULT &&
@ -1795,12 +1797,12 @@ int main(int argc, char **argv, char **envp) {
} else { } else {
char *ptr2 = alloc_printf(" + NGRAM-%u", ngram_size); char *ptr2 = alloc_printf(" + NGRAM-%u", ngram_size);
ptr = alloc_printf("%s%s%s%s", instrument_mode_string[instrument_mode], ptr = alloc_printf(
"%s%s%s%s", instrument_mode_string[instrument_mode],
(instrument_opt_mode & INSTRUMENT_OPT_CTX) ? " + CTX" : "", (instrument_opt_mode & INSTRUMENT_OPT_CTX) ? " + CTX" : "",
(instrument_opt_mode & INSTRUMENT_OPT_CALLER) ? " + CALLER" : "", (instrument_opt_mode & INSTRUMENT_OPT_CALLER) ? " + CALLER" : "",
(instrument_opt_mode & INSTRUMENT_OPT_NGRAM) ? ptr2 : "" (instrument_opt_mode & INSTRUMENT_OPT_NGRAM) ? ptr2 : "");
);
ck_free(ptr2); ck_free(ptr2);
} }