aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhexcoder- <heiko@hexco.de>2020-12-30 13:02:11 +0100
committerhexcoder- <heiko@hexco.de>2020-12-30 13:02:11 +0100
commitb0d69f1b6995a9ddc0aebb0c289da79ebd3fc5e9 (patch)
tree600f571059714e69a338500bdcb6e923a7d62102
parent5a99e67e02d8f4cc4ece7cfb16d4fba862b63be0 (diff)
downloadafl++-b0d69f1b6995a9ddc0aebb0c289da79ebd3fc5e9.tar.gz
cleanup of hot fix for -s on 32-bit
-rw-r--r--include/afl-fuzz.h3
-rw-r--r--src/afl-performance.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 57b0e6cc..0bf0aebe 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -590,7 +590,8 @@ typedef struct afl_state {
u32 rand_cnt; /* Random number counter */
- u64 rand_seed[3];
+/* unsigned long rand_seed[3]; would also work */
+ AFL_RAND_RETURN rand_seed[3];
s64 init_seed;
u64 total_cal_us, /* Total calibration time (us) */
diff --git a/src/afl-performance.c b/src/afl-performance.c
index 4bca95d6..89b170eb 100644
--- a/src/afl-performance.c
+++ b/src/afl-performance.c
@@ -56,13 +56,13 @@ inline AFL_RAND_RETURN rand_next(afl_state_t *afl) {
// RomuTrio32
inline AFL_RAND_RETURN rand_next(afl_state_t *afl) {
- AFL_RAND_RETURN xp = (u32)afl->rand_seed[0], yp = (u32)afl->rand_seed[1],
- zp = (u32)afl->rand_seed[2];
+ AFL_RAND_RETURN xp = afl->rand_seed[0], yp = afl->rand_seed[1],
+ zp = afl->rand_seed[2];
afl->rand_seed[0] = 3323815723u * zp;
afl->rand_seed[1] = yp - xp;
- afl->rand_seed[1] = ROTL((u32)afl->rand_seed[1], 6);
+ afl->rand_seed[1] = ROTL(afl->rand_seed[1], 6);
afl->rand_seed[2] = zp - yp;
- afl->rand_seed[2] = ROTL((u32)afl->rand_seed[2], 22);
+ afl->rand_seed[2] = ROTL(afl->rand_seed[2], 22);
return xp;
}