From: Julien Pauli <jpauli@php.net>
Date: Mon, 16 Mar 2015 15:00:46 +0000 (+0100)
Subject: Fix flaws in session module
X-Git-Tag: php-5.5.24RC1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4dba99c226b5142228689a75ce13936cee49e8ae;p=php

Fix flaws in session module
---

diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index b40d44f56a..94a26a319d 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -278,7 +278,6 @@ PHPAPI void php_session_reset_id(TSRMLS_D);
 PHPAPI ZEND_EXTERN_MODULE_GLOBALS(ps)
 
 void php_session_auto_start(void *data);
-void php_session_shutdown(void *data);
 
 #define PS_CLASS_NAME "SessionHandler"
 extern zend_class_entry *php_session_class_entry;
diff --git a/ext/session/session.c b/ext/session/session.c
index 9b609308ed..a173fcad0f 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -115,6 +115,7 @@ static inline void php_rshutdown_session_globals(TSRMLS_D) /* {{{ */
 	}
 	if (PS(id)) {
 		efree(PS(id));
+		PS(id) = NULL;
 	}
 }
 /* }}} */