Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GH-1076: Fix bro_srandom() to replace 0 seeds with 1

Browse source 
The bro_prng() implementation cannot generate 0 as a result since it
causes every subsequent number from the PRNG to also be 0, so use the
number 1 instead of 0.
This commit is contained in:
Jon Siwek 2020-07-22 00:07:34 -07:00
parent 0f4eb9af02
commit 887b53b7f3
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/util.cc
View file

@ -1072,7 +1072,7 @@ static unsigned int first_seed = 0;
static void bro_srandom(unsigned int seed, bool deterministic)
{
bro_rand_state = seed;
bro_rand_state = seed == 0 ? 1 : seed;
bro_rand_determistic = deterministic;
srandom(seed);
@ -1081,7 +1081,7 @@ static void bro_srandom(unsigned int seed, bool deterministic)
void bro_srandom(unsigned int seed)
{
if ( bro_rand_determistic )
bro_rand_state = seed;
bro_rand_state = seed == 0 ? 1 : seed;
else
srandom(seed);
}

6
testing/btest/Baseline/bifs.rand/out.4 Normal file
View file

@ -0,0 +1,6 @@
0
131
755
4
634
473

3
testing/btest/bifs/rand.zeek
View file

@ -2,9 +2,12 @@
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: zeek -b %INPUT do_seed=F >out.2
# @TEST-EXEC: unset ZEEK_SEED_FILE && zeek -b %INPUT real_random=T >out.3
# @TEST-EXEC: for i in $(seq 21); do echo 0 >>random-zero.seed; done
# @TEST-EXEC: ZEEK_SEED_FILE=random-zero.seed zeek -b %INPUT >out.4
# @TEST-EXEC: btest-diff out
# @TEST-EXEC: btest-diff out.2
# @TEST-EXEC: btest-diff out.3
# @TEST-EXEC: btest-diff out.4
const do_seed = T &redef;
const real_random = F &redef;