diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2012-03-08 03:31:46 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2012-03-08 03:31:46 +0000 |
| commit | ef61504b3529699cbc242f62621a48a780fbcde6 (patch) | |
| tree | 268062386dc7a78e8a5fce91a876d4d11d5efd3a /ext/session/session.c | |
| parent | ac6ea3d06798c8f83af80921269c734752e5875c (diff) | |
| download | php-git-ef61504b3529699cbc242f62621a48a780fbcde6.tar.gz | |
Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index b1224321a6..7a8199d810 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1450,9 +1450,7 @@ static void php_session_flush(TSRMLS_D) /* {{{ */ { if (PS(session_status) == php_session_active) { PS(session_status) = php_session_none; - zend_try { - php_session_save_current_state(TSRMLS_C); - } zend_end_try(); + php_session_save_current_state(TSRMLS_C); } } /* }}} */ @@ -2142,7 +2140,9 @@ static PHP_RSHUTDOWN_FUNCTION(session) /* {{{ */ { int i; - php_session_flush(TSRMLS_C); + zend_try { + php_session_flush(TSRMLS_C); + } zend_end_try(); php_rshutdown_session_globals(TSRMLS_C); /* this should NOT be done in php_rshutdown_session_globals() */ |