Merge branch 'PHP-8.2'

TimWolla · TimWolla · commit 5f42a46405c7 · 2023-01-07T14:03:26.000+01:00
* PHP-8.2: random: Fix check before closing `random_fd` (#10247)
diff --git a/ext/random/random.c b/ext/random/random.c
@@ -827,7 +827,7 @@ static PHP_GINIT_FUNCTION(random)
 /* {{{ PHP_GSHUTDOWN_FUNCTION */
 static PHP_GSHUTDOWN_FUNCTION(random)
 {
-	if (random_globals->random_fd > 0) {
+	if (random_globals->random_fd >= 0) {
 		close(random_globals->random_fd);
 		random_globals->random_fd = -1;
 	}

Original file line number	Diff line number	Diff line change
`@@ -827,7 +827,7 @@ static PHP_GINIT_FUNCTION(random)`
`827`	`827`	`/* {{{ PHP_GSHUTDOWN_FUNCTION */`
`828`	`828`	`static PHP_GSHUTDOWN_FUNCTION(random)`
`829`	`829`	`{`
`830`		`- if (random_globals->random_fd > 0) {`
	`830`	`+ if (random_globals->random_fd >= 0) {`
`831`	`831`	`close(random_globals->random_fd);`
`832`	`832`	`random_globals->random_fd = -1;`
`833`	`833`	`}`