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 /ext/session/mod_user_class.c | |
| 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
Diffstat (limited to 'ext/session/mod_user_class.c')
| -rw-r--r-- | ext/session/mod_user_class.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |