diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-01-20 10:55:09 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-01-20 10:55:09 +0000 |
| commit | 7d100866ec2aa941555b4616dedae69d935c601b (patch) | |
| tree | f3f717da8c02ce89957e17980fb56596b9c7e464 /ext/session/mod_user.c | |
| parent | 11cf826b8960f0d9af5368b1af90ac3f81947f16 (diff) | |
| parent | d284072f787595df4d687ed5dc605f655206b31e (diff) | |
| download | php-git-7d100866ec2aa941555b4616dedae69d935c601b.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'ext/session/mod_user.c')
| -rw-r--r-- | ext/session/mod_user.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index e6f162855a..c7c09ff781 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -85,7 +85,16 @@ PS_OPEN_FUNC(user) ZVAL_STRING(&args[0], (char*)save_path); ZVAL_STRING(&args[1], (char*)session_name); - ps_call_handler(&PSF(open), 2, args, &retval); + zend_try { + ps_call_handler(&PSF(open), 2, args, &retval); + } zend_catch { + PS(session_status) = php_session_none; + if (!Z_ISUNDEF(retval)) { + zval_ptr_dtor(&retval); + } + zend_bailout(); + } zend_end_try(); + PS(mod_user_implemented) = 1; FINISH; |