com php-src: Merge branch 'PHP-5.6': ext/session/mod_user_c lass.c
| From: | Adam Harvey | Date: | Mon, 08 Sep 2014 19:31:58 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/session/mod_user_c lass.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81457@lists.php.net to get a copy of this message | ||
Commit: d91717f458d5d3fd0e5d7278c2a6d16e7b4d52e6
Author: Adam Harvey <aharvey@php.net> Mon, 8 Sep 2014 19:31:58 +0000
Parents: 9ee4a40f27c7c7fcd0edcd3a7420ea7cdf299f45 0cbfdc9df5632f293c757472cd5ad6ef46dd0179
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d91717f458d5d3fd0e5d7278c2a6d16e7b4d52e6
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
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
Bugs:
https://bugs.php.net/67972
Changed paths:
MM ext/session/mod_user_class.c
Diff:
diff --cc ext/session/mod_user_class.c
index 33fc71c,2cbe482..35a681b
--- a/ext/session/mod_user_class.c
+++ b/ext/session/mod_user_class.c
@@@ -142,8 -146,10 +142,10 @@@ PHP_METHOD(SessionHandler, gc
Wraps the old create_sid handler */
PHP_METHOD(SessionHandler, create_sid)
{
- char *id;
+ zend_string *id;
+ PS_SANITY_CHECK;
+
if (zend_parse_parameters_none() == FAILURE) {
return;
}