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

Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null)

Browse Source
This commit is contained in:
Xinchen Hui
2014-01-16 14:41:12 +08:00
parent 271053ad47
commit b777248ded
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+4
View File
@@ -5,6 +5,10 @@ PHP NEWS
- Core:
. Fixed bug #66286 (Incorrect object comparison with inheritance). (Nikita)
- Session:
. Fixed bug #66481 (Calls to session_name() segfault when session.name is
null). (Laruence)
?? ??? 2013, PHP 5.4.24
- Core:
ext/session/session.c
+2 -3
View File
@@ -618,11 +618,10 @@ static PHP_INI_MH(OnUpdateSaveDir) /* {{{ */
static PHP_INI_MH(OnUpdateName) /* {{{ */
{
/* Numeric session.name won't work at all */
if (PG(modules_activated) &&
(!new_value_length || is_numeric_string(new_value, new_value_length, NULL, NULL, 0))) {
if ((!new_value_length || is_numeric_string(new_value, new_value_length, NULL, NULL, 0))) {
int err_type;
if (stage == ZEND_INI_STAGE_RUNTIME) {
if (stage == ZEND_INI_STAGE_RUNTIME || stage == ZEND_INI_STAGE_ACTIVATE || stage == ZEND_INI_STAGE_STARTUP) {
err_type = E_WARNING;
} else {
err_type = E_ERROR;
ext/session/tests/bug66481.phpt
+17
View File
@@ -0,0 +1,17 @@
--TEST--
Bug #66481: Calls to session_name() segfault when session.name is null.
--INI--
session.name=
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
var_dump(session_name("foo"));
var_dump(session_name("bar"));
--EXPECTF--
PHP Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0
Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0
string(9) "PHPSESSID"
string(3) "foo"