Skip to content

Fix session save-handler argv leak on recursive rejection #22382

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
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+40 −9
Open

Fix session save-handler argv leak on recursive rejection #22382

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
18 changes: 9 additions & 9 deletions ext/session/mod_user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ static void ps_call_handler(zval *func, int argc, zval *argv, zval *retval)
PS(in_save_handler) = 0;
ZVAL_UNDEF(retval);
php_error_docref(NULL, E_WARNING, "Cannot call session save handler in a recursive manner");
return;
}
PS(in_save_handler) = 1;
if (call_user_function(NULL, NULL, func, retval, argc, argv) == FAILURE) {
zval_ptr_dtor(retval);
ZVAL_UNDEF(retval);
} else if (Z_ISUNDEF_P(retval)) {
ZVAL_NULL(retval);
} else {
PS(in_save_handler) = 1;
if (call_user_function(NULL, NULL, func, retval, argc, argv) == FAILURE) {
zval_ptr_dtor(retval);
ZVAL_UNDEF(retval);
} else if (Z_ISUNDEF_P(retval)) {
ZVAL_NULL(retval);
}
PS(in_save_handler) = 0;
}
PS(in_save_handler) = 0;
for (i = 0; i < argc; i++) {
zval_ptr_dtor(&argv[i]);
}
Expand Down
31 changes: 31 additions & 0 deletions ext/session/tests/user_session_module/recursive_handler_argv_leak.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--TEST--
ps_call_handler() releases argv when a recursive save-handler call is rejected
--INI--
session.save_path=
session.name=PHPSESSID
--EXTENSIONS--
session
--FILE--
<?php
class H extends SessionHandler {
public bool $tripped = false;
public function write($id, $data): bool {
if (!$this->tripped) {
$this->tripped = true;
session_destroy();
}
return true;
}
}

session_set_save_handler(new H, true);
session_start();
$_SESSION['x'] = 1;
session_write_close();
echo "done\n";
?>
--EXPECTF--
Warning: session_destroy(): Cannot call session save handler in a recursive manner in %s on line %d

Warning: session_destroy(): Session object destruction failed in %s on line %d
done
Loading