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
This commit is contained in:
Adam Harvey 2014-09-08 19:28:15 +00:00
commit 0cbfdc9df5
3 changed files with 15 additions and 0 deletions

3
NEWS
View File

@ -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:

View File

@ -148,6 +148,8 @@ PHP_METHOD(SessionHandler, create_sid)
{
char *id;
PS_SANITY_CHECK;
if (zend_parse_parameters_none() == FAILURE) {
return;
}

View File

@ -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