Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion ext/session/session.c
Original file line number Diff line number Diff line change
Expand Up @@ -693,9 +693,18 @@ static PHP_INI_MH(OnUpdateCookieLifetime) /* {{{ */
{
SESSION_CHECK_ACTIVE_STATE;
SESSION_CHECK_OUTPUT_STATE;
if (atol(ZSTR_VAL(new_value)) < 0) {

#ifdef ZEND_ENABLE_ZVAL_LONG64
const zend_long maxcookie = ZEND_LONG_MAX - INT_MAX - 1;
#else
const zend_long maxcookie = ZEND_LONG_MAX / 2 - 1;
#endif
zend_long v = (zend_long)atol(ZSTR_VAL(new_value));
if (v < 0) {
php_error_docref(NULL, E_WARNING, "CookieLifetime cannot be negative");
return FAILURE;
} else if (v > maxcookie) {
return SUCCESS;
}
return OnUpdateLongGEZero(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
}
Expand Down
13 changes: 13 additions & 0 deletions ext/session/tests/gh16290.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--TEST--
GH-16290 (overflow on session cookie_lifetime ini)
--EXTENSIONS--
session
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
session_set_cookie_params(PHP_INT_MAX, '/', null, false, true);
echo "DONE";
?>
--EXPECT--
DONE
4 changes: 2 additions & 2 deletions ext/session/tests/session_get_cookie_params_basic.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var_dump(session_get_cookie_params());
echo "Done";
ob_end_flush();
?>
--EXPECT--
--EXPECTF--
*** Testing session_get_cookie_params() : basic functionality ***
array(6) {
["lifetime"]=>
Expand Down Expand Up @@ -69,7 +69,7 @@ array(6) {
bool(true)
array(6) {
["lifetime"]=>
int(1234567890)
int(%d)
["path"]=>
string(5) "/guff"
["domain"]=>
Expand Down
Loading