diff options
author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-08-05 12:54:52 +0200 |
---|---|---|
committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-08-05 12:54:52 +0200 |
commit | 2d650f8c2262f99e01950d39c45f242f2e7dfbc9 (patch) | |
tree | f4ff3ba7fb5efb862d90585e212ac82ed2d861ca /include/afl-fuzz.h | |
parent | 19631851f6c7ecac42fb76ff70314f4e0777d3f3 (diff) | |
parent | f30ca1476c2d4d08d46fe9657ad4aa1d828eb578 (diff) | |
download | afl++-2d650f8c2262f99e01950d39c45f242f2e7dfbc9.tar.gz |
merge conflict
Diffstat (limited to 'include/afl-fuzz.h')
-rw-r--r-- | include/afl-fuzz.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index 2324efa5..bb1bb314 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -986,7 +986,7 @@ uint64_t rand_next(afl_state_t *afl); static inline u32 rand_below(afl_state_t *afl, u32 limit) { - if (limit <= 1) return 0; + if (limit <= 1) return 0; /* The boundary not being necessarily a power of 2, we need to ensure the result uniformity. */ @@ -1008,7 +1008,7 @@ static inline u32 rand_below(afl_state_t *afl, u32 limit) { expand havoc mode */ static inline u32 rand_below_datalen(afl_state_t *afl, u32 limit) { - if (limit <= 1) return 0; + if (limit <= 1) return 0; switch (rand_below(afl, 3)) { |