fix mt seed

Author: zeriyoshi

ext/random/random.c

@@ -575,6 +575,23 @@ static inline void mersennetwister_reload(php_random_engine_state_mersennetwiste
 	state->cnt = 0;
 }
 
+static void mersennetwister_seed(void *state, const uint64_t seed) {
+	/* Initialize generator state with seed
+	   See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier.
+	   In previous versions, most significant bits (MSBs) of the seed affect
+	   only MSBs of the state array.  Modified 9 Jan 2002 by Makoto Matsumoto. */
+	php_random_engine_state_mersennetwister *s = state;
+
+	s->s[0] = seed & 0xffffffffU;
+	for (s->cnt = 1; s->cnt < MT_N; s->cnt++) {
+		s->s[s->cnt] = (1812433253U * (s->s[s->cnt - 1] ^ (s->s[s->cnt - 1] >> 30)) + s->cnt) & 0xffffffffU;
+	}
+	mersennetwister_reload(s);
+
+	/* Seed only once */
+	s->seeded = true;
+}
+
 static uint64_t mersennetwister_generate(void *state, bool *engine_unsafe) {
 	php_random_engine_state_mersennetwister *s = state;
 	uint32_t s1;
@@ -584,10 +601,9 @@ static uint64_t mersennetwister_generate(void *state, bool *engine_unsafe) {
 		if (php_random_bytes_silent(&bytes, sizeof(zend_long)) == FAILURE) {
 			bytes = GENERATE_SEED();
 		}
-		php_mt_srand(bytes);
+		mersennetwister_seed(state, bytes);
 	}
 
-
 	if (s->cnt >= MT_N) {
 		mersennetwister_reload(s);
 	}
@@ -599,23 +615,6 @@ static uint64_t mersennetwister_generate(void *state, bool *engine_unsafe) {
 	return (uint64_t) (s1 ^ (s1 >> 18));
 }
 
-static void mersennetwister_seed(void *state, const uint64_t seed) {
-	/* Initialize generator state with seed
-	   See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier.
-	   In previous versions, most significant bits (MSBs) of the seed affect
-	   only MSBs of the state array.  Modified 9 Jan 2002 by Makoto Matsumoto. */
-	php_random_engine_state_mersennetwister *s = state;
-
-	s->s[0] = seed & 0xffffffffU;
-	for (s->cnt = 1; s->cnt < MT_N; s->cnt++) {
-		s->s[s->cnt] = (1812433253U * (s->s[s->cnt - 1] ^ (s->s[s->cnt - 1] >> 30)) + s->cnt) & 0xffffffffU;
-	}
-	mersennetwister_reload(s);
-
-	/* Seed only once */
-	s->seeded = true;
-}
-
 static int mersennetwister_serialize(void *state, HashTable *data) {
 	php_random_engine_state_mersennetwister *s = state;
 	zval tmp;
@@ -1761,7 +1760,7 @@ PHP_METHOD(Random_Engine_Xoshiro256StarStar, __construct)
 PHP_METHOD(Random_Engine_Xoshiro256StarStar, jump)
 {
 	php_random_engine *engine = Z_RANDOM_ENGINE_P(ZEND_THIS);
-	php_random_engine_state_xoshiro256starstar *s = (php_random_engine_state_xoshiro256starstar *) engine->state;
+	php_random_engine_state_xoshiro256starstar *s = engine->state;
 	static const uint64_t jmp[] = { 0x180ec6d33cfd0aba, 0xd5a61266f0c9392c, 0xa9582618e03fc9aa, 0x39abdc4529b1661c };
 	uint64_t s0 = 0, s1 = 0, s2 = 0, s3 = 0;
 	int i, j;