Merge branch 'PHP-8.2' into PHP-8.3

TimWolla · TimWolla · commit 0d0375ab91a0 · 2024-03-13T20:14:42.000+01:00
* PHP-8.2: random: Initialize the `mode` field when seeding in `php_random_default_status()` (#13690)
diff --git a/NEWS b/NEWS
@@ -29,6 +29,8 @@ PHP                                                                        NEWS
 - Random:
   . Fixed bug GH-13544 (Pre-PHP 8.2 compatibility for mt_srand with unknown
     modes). (timwolla)
+  . Fixed bug GH-13690 (Global Mt19937 is not properly reset in-between
+    requests when MT_RAND_PHP is used). (timwolla)
 
 - Session:
   . Fixed bug GH-13680 (Segfault with session_decode and compilation error).
diff --git a/ext/random/random.c b/ext/random/random.c
@@ -315,6 +315,7 @@ PHPAPI php_random_status *php_random_default_status(void)
 	php_random_status *status = RANDOM_G(mt19937);
 
 	if (!RANDOM_G(mt19937_seeded)) {
+		((php_random_status_state_mt19937 *)status->state)->mode = MT_RAND_MT19937;
 		php_random_mt19937_seed_default(status->state);
 		RANDOM_G(mt19937_seeded) = true;
 	}

Original file line number	Diff line number	Diff line change
`@@ -315,6 +315,7 @@ PHPAPI php_random_status *php_random_default_status(void)`
`315`	`315`	`php_random_status *status = RANDOM_G(mt19937);`
`316`	`316`
`317`	`317`	`if (!RANDOM_G(mt19937_seeded)) {`
	`318`	`+ ((php_random_status_state_mt19937 *)status->state)->mode = MT_RAND_MT19937;`
`318`	`319`	`php_random_mt19937_seed_default(status->state);`
`319`	`320`	`RANDOM_G(mt19937_seeded) = true;`
`320`	`321`	`}`