[session] Close save handler before re-initializing an active session

NEWS

@@ -115,6 +115,8 @@ PHP                                                                        NEWS
     is freed while the stream is still open). (Eyüp Can Akman)
 
 - Session:
+  . Fixed calling SessionHandler::open() twice without an intervening close()
+    when resetting or re-initializing an active session. (iliaal)
   . Fix corruption in mod_mm. (ndossche)
   . Fixed bug GH-23043 (broken session id code can cause zend_mm_heap
     corrupted). (ndossche)

ext/session/session.c

@@ -420,6 +420,10 @@ static zend_result php_session_initialize(void) /* {{{ */
 {
 	zend_string *val = NULL;
 
+	if (PS(session_status) == php_session_active) {
+		php_session_abort();
+	}
+
 	PS(session_status) = php_session_active;
 
 	if (!PS(mod)) {

ext/session/tests/session_reset_handler_close.phpt

@@ -0,0 +1,60 @@
+--TEST--
+Session reset closes the save handler before reopening it
+--INI--
+session.use_cookies=0
+session.gc_probability=0
+--FILE--
+<?php
+
+class LoggingHandler implements SessionHandlerInterface
+{
+    public function open(string $path, string $name): bool
+    {
+        $GLOBALS['calls'][] = 'open';
+        return true;
+    }
+    public function close(): bool
+    {
+        $GLOBALS['calls'][] = 'close';
+        return true;
+    }
+    public function read(string $id): string|false
+    {
+        $GLOBALS['calls'][] = 'read';
+        return '';
+    }
+    public function write(string $id, string $data): bool
+    {
+        $GLOBALS['calls'][] = 'write';
+        return true;
+    }
+    public function destroy(string $id): bool
+    {
+        $GLOBALS['calls'][] = 'destroy';
+        return true;
+    }
+    public function gc(int $max_lifetime): int|false
+    {
+        $GLOBALS['calls'][] = 'gc';
+        return 0;
+    }
+}
+
+$GLOBALS['calls'] = [];
+session_set_save_handler(new LoggingHandler(), true);
+var_dump(session_start());
+var_dump(session_reset());
+print_r($GLOBALS['calls']);
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+Array
+(
+    [0] => open
+    [1] => read
+    [2] => close
+    [3] => open
+    [4] => read
+)