From: Julien Pauli <jpauli@php.net>
Date: Mon, 16 Mar 2015 15:11:02 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~652
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d3a3811a955827ca4163c79562705324886a8e2;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix flaws in session module

Conflicts:
	ext/session/session.c
---

4d3a3811a955827ca4163c79562705324886a8e2
diff --cc ext/session/session.c
index 25139d5ddb,b73d5ede8d..0ddf6003bb
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@@ -125,11 -114,9 +125,13 @@@ static inline void php_rshutdown_sessio
  		} zend_end_try();
  	}
  	if (PS(id)) {
 -		efree(PS(id));
 +		zend_string_release(PS(id));
+ 		PS(id) = NULL;
  	}
 +	if (PS(session_vars)) {
 +		zend_string_release(PS(session_vars));
++		PS(session_vars) = NULL;
 +	}
  }
  /* }}} */