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

fix warnings and weird code insert

Browse Source
This commit is contained in:
van Hauser
2020-08-31 13:12:59 +02:00
parent 81767287c3
commit d2c9e4baa7
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
llvm_mode/afl-llvm-lto-instrumentation.so.cc
View File

@ -374,14 +374,28 @@ bool AFLLTOPass::runOnModule(Module &M) {
std::string Str1, Str2; std::string Str1, Str2;
StringRef TmpStr; StringRef TmpStr;
bool HasStr1 = getConstantStringInfo(Str1P, TmpStr); bool HasStr1 = getConstantStringInfo(Str1P, TmpStr);
if (TmpStr.empty()) if (TmpStr.empty()) {
HasStr1 = false; HasStr1 = false;
else
} else {
HasStr1 = true;
Str1 = TmpStr.str(); Str1 = TmpStr.str();
}
bool HasStr2 = getConstantStringInfo(Str2P, TmpStr); bool HasStr2 = getConstantStringInfo(Str2P, TmpStr);
if (TmpStr.empty()) HasStr2 = false; if (TmpStr.empty()) {
(void)HasStr2 /* never read */
else Str2 = TmpStr.str(); HasStr2 = false;
} else {
HasStr2 = true;
Str2 = TmpStr.str();
}
if (debug) if (debug)
fprintf(stderr, "F:%s %p(%s)->\"%s\"(%s) %p(%s)->\"%s\"(%s)\n", fprintf(stderr, "F:%s %p(%s)->\"%s\"(%s) %p(%s)->\"%s\"(%s)\n",

12
src/afl-performance.c
View File

@ -72,12 +72,12 @@ void jump(afl_state_t *afl) {
static const uint64_t JUMP[] = {0x180ec6d33cfd0aba, 0xd5a61266f0c9392c, static const uint64_t JUMP[] = {0x180ec6d33cfd0aba, 0xd5a61266f0c9392c,
0xa9582618e03fc9aa, 0x39abdc4529b1661c}; 0xa9582618e03fc9aa, 0x39abdc4529b1661c};
int i, b; size_t i, b;
uint64_t s0 = 0; uint64_t s0 = 0;
uint64_t s1 = 0; uint64_t s1 = 0;
uint64_t s2 = 0; uint64_t s2 = 0;
uint64_t s3 = 0; uint64_t s3 = 0;
for (i = 0; i < sizeof JUMP / sizeof *JUMP; i++) for (i = 0; i < (sizeof(JUMP) / sizeof(*JUMP)); i++)
for (b = 0; b < 64; b++) { for (b = 0; b < 64; b++) {
if (JUMP[i] & UINT64_C(1) << b) { if (JUMP[i] & UINT64_C(1) << b) {
@ -110,12 +110,12 @@ void long_jump(afl_state_t *afl) {
static const uint64_t LONG_JUMP[] = {0x76e15d3efefdcbbf, 0xc5004e441c522fb3, static const uint64_t LONG_JUMP[] = {0x76e15d3efefdcbbf, 0xc5004e441c522fb3,
0x77710069854ee241, 0x39109bb02acbe635}; 0x77710069854ee241, 0x39109bb02acbe635};
int i, b; size_t i, b;
uint64_t s0 = 0; uint64_t s0 = 0;
uint64_t s1 = 0; uint64_t s1 = 0;
uint64_t s2 = 0; uint64_t s2 = 0;
uint64_t s3 = 0; uint64_t s3 = 0;
for (i = 0; i < sizeof LONG_JUMP / sizeof *LONG_JUMP; i++) for (i = 0; i < (sizeof(LONG_JUMP) / sizeof(*LONG_JUMP)); i++)
for (b = 0; b < 64; b++) { for (b = 0; b < 64; b++) {
if (LONG_JUMP[i] & UINT64_C(1) << b) { if (LONG_JUMP[i] & UINT64_C(1) << b) {
@ -145,7 +145,7 @@ void long_jump(afl_state_t *afl) {
u32 hash32(u8 *key, u32 len, u32 seed) { u32 hash32(u8 *key, u32 len, u32 seed) {
#else #else
u32 inline hash32(u8 *key, u32 len, u32 seed) { inline u32 hash32(u8 *key, u32 len, u32 seed) {
#endif #endif
@ -157,7 +157,7 @@ u32 inline hash32(u8 *key, u32 len, u32 seed) {
u64 hash64(u8 *key, u32 len, u64 seed) { u64 hash64(u8 *key, u32 len, u64 seed) {
#else #else
u64 inline hash64(u8 *key, u32 len, u64 seed) { inline u64 hash64(u8 *key, u32 len, u64 seed) {
#endif #endif