com php-src: Merge branch 'PHP-5.6': ext/session/php_session .h ext/session/session.c
| From: | JulienPauli | Date: | Mon, 16 Mar 2015 15:11:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/session/php_session .h ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85530@lists.php.net to get a copy of this message | ||
Commit: 4d3a3811a955827ca4163c79562705324886a8e2
Author: Julien Pauli <jpauli@php.net> Mon, 16 Mar 2015 16:11:02 +0100
Parents: 0a6ab089cd28b3ef4504777c0122d788a827b54f 2a5087742824032927e24f166ef64b8c59a5b32a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4d3a3811a955827ca4163c79562705324886a8e2
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix flaws in session module
Conflicts:
ext/session/session.c
Changed paths:
MM ext/session/php_session.h
MM ext/session/session.c
Diff:
diff --cc ext/session/session.c
index 25139d5,b73d5ed..0ddf600
--- 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;
+ }
}
/* }}} */