Skip to content

Fix GH-25307: NULL ps_files deref after SessionHandler::open() on user module #25315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lazerg wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
Open

Fix GH-25307: NULL ps_files deref after SessionHandler::open() on user module #25315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ext/session/mod_user_class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

#include "php.h"
#include "php_session.h"
#include "mod_user.h"

#define PS_SANITY_CHECK \
if (PS(session_status) != php_session_active) { \
zend_throw_error(NULL, "Session is not active"); \
RETURN_THROWS(); \
} \
if (PS(default_mod) == NULL) { \
if (PS(default_mod) == NULL || PS(default_mod) == ps_user_ptr) { \
zend_throw_error(NULL, "Cannot call default session handler"); \
RETURN_THROWS(); \
}
Expand Down
24 changes: 24 additions & 0 deletions ext/session/tests/user_session_module/gh25307.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--TEST--
GH-25307 (NULL ps_files dereference in ps_files_close at shutdown)
--EXTENSIONS--
session
--SKIPIF--
<?php include(__DIR__ . '/../skipif.inc'); ?>
--CREDITS--
YuanchengJiang
--FILE--
<?php
ob_start();
session_set_save_handler(new SessionHandler(), true);
ini_set("session.save_handler", "files");
session_start();
try {
(new SessionHandler)->open("", "");
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
echo "Done\n";
?>
--EXPECT--
Cannot call default session handler
Done
Loading