php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  Revert "ext/session: Fix memory leak due to multiple exception happening during session abort"
This commit is contained in:
ndossche
2026-03-10 20:29:14 +01:00
parent 6e664a04cb 3b8aac8dad
commit 64092352a4
3 changed files with 1 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/session/session.c
View File

@@ -41,7 +41,6 @@
#include "ext/standard/url_scanner_ex.h" #include "ext/standard/url_scanner_ex.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "zend_smart_str.h" #include "zend_smart_str.h"
#include "zend_exceptions.h"
#include "ext/standard/url.h" #include "ext/standard/url.h"
#include "ext/standard/basic_functions.h" #include "ext/standard/basic_functions.h"
#include "ext/standard/head.h" #include "ext/standard/head.h"
@@ -1725,16 +1724,8 @@ PHPAPI php_session_status php_get_session_status(void)
static bool php_session_abort(void) static bool php_session_abort(void)
{ {
if (PS(session_status) == php_session_active) { if (PS(session_status) == php_session_active) {
if ((PS(mod_data) || PS(mod_user_implemented)) && PS(mod)->s_close) { if (PS(mod_data) || PS(mod_user_implemented)) {
zend_object *old_exception = EG(exception);
EG(exception) = NULL;
PS(mod)->s_close(&PS(mod_data)); PS(mod)->s_close(&PS(mod_data));
if (!EG(exception)) {
EG(exception) = old_exception;
} else if (old_exception) {
zend_exception_set_previous(EG(exception), old_exception);
}
} }
PS(session_status) = php_session_none; PS(session_status) = php_session_none;
return true; return true;

35
ext/session/tests/sessionhandler_validateid_return_type.phpt
View File

@@ -1,35 +0,0 @@
--TEST--
SessionHandler::validateId must return bool
--INI--
session.use_strict_mode=1
--EXTENSIONS--
session
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
class MySession extends SessionHandler {
public function validateId($key) {
return null;
}
}
$handler = new MySession();
try {
session_set_save_handler($handler);
session_start();
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
session_write_close();
try {
session_start();
} catch (Throwable $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECTF--
Session id must be a string

2
ext/session/tests/user_session_module/session_set_save_handler_class_012.phpt
View File

@@ -43,8 +43,6 @@ var_dump(session_id(), $oldHandler, ini_get('session.save_handler'), $handler->i
--EXPECTF-- --EXPECTF--
*** Testing session_set_save_handler() : incorrect arguments for existing handler open *** *** Testing session_set_save_handler() : incorrect arguments for existing handler open ***
Open: Open:
Warning: SessionHandler::close(): Parent session handler is not open in %s on line %d
SessionHandler::open() expects exactly 2 arguments, 0 given SessionHandler::open() expects exactly 2 arguments, 0 given
Warning: Undefined global variable $_SESSION in %s on line %d Warning: Undefined global variable $_SESSION in %s on line %d