diff options
| author | Adam Harvey <aharvey@php.net> | 2014-09-08 19:28:15 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-09-08 19:28:15 +0000 |
| commit | 0cbfdc9df5632f293c757472cd5ad6ef46dd0179 (patch) | |
| tree | a338d9fc280c928aa63201484d7c3a6779e5ecdf | |
| parent | 03797a73b25996315b6c6ce606a9d8724439699e (diff) | |
| parent | bc44eb61728951ffe789be91ea0142a4120afc50 (diff) | |
| download | php-git-0cbfdc9df5632f293c757472cd5ad6ef46dd0179.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
5.5.18 now
Conflicts:
configure.in
main/php_version.h
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/session/mod_user_class.c | 2 | ||||
| -rw-r--r-- | ext/session/tests/bug67972.phpt | 10 |
3 files changed, 15 insertions, 0 deletions
@@ -38,6 +38,9 @@ PHP NEWS - SOAP: . Fixed bug #67955 (SoapClient prepends 0-byte to cookie names). (Philip Hofstetter) +- Session: + . Fixed bug #67972 (SessionHandler Invalid memory read create_sid()). (Adam) + 28 Aug 2014, PHP 5.6.0 - Apache2 Handler SAPI: diff --git a/ext/session/mod_user_class.c b/ext/session/mod_user_class.c index 5b1480bf8c..2cbe482349 100644 --- a/ext/session/mod_user_class.c +++ b/ext/session/mod_user_class.c @@ -148,6 +148,8 @@ PHP_METHOD(SessionHandler, create_sid) { char *id; + PS_SANITY_CHECK; + if (zend_parse_parameters_none() == FAILURE) { return; } diff --git a/ext/session/tests/bug67972.phpt b/ext/session/tests/bug67972.phpt new file mode 100644 index 0000000000..63ed3a95b8 --- /dev/null +++ b/ext/session/tests/bug67972.phpt @@ -0,0 +1,10 @@ +--TEST-- +Bug #67972: SessionHandler Invalid memory read create_sid() +--SKIPIF-- +<?php include('skipif.inc'); ?> +--FILE-- +<?php + +(new SessionHandler)->create_sid(); +--EXPECTF-- +Fatal error: SessionHandler::create_sid(): Cannot call default session handler in %s on line %d |