From: Adam Harvey <aharvey@php.net>
Date: Mon, 8 Sep 2014 19:31:58 +0000 (+0000)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_REMOVALS~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d91717f458d5d3fd0e5d7278c2a6d16e7b4d52e6;p=php

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

d91717f458d5d3fd0e5d7278c2a6d16e7b4d52e6
diff --cc ext/session/mod_user_class.c
index 33fc71c569,2cbe482349..35a681babd
--- 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;
  	}