From: Antony Dovgal Date: Thu, 9 Dec 2004 14:14:21 +0000 (+0000) Subject: fix segfault in session_module_name() when session.save_handler is empty X-Git-Tag: RELEASE_0_2~545 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e76824c91fd428b663dd14dfbabe9501e26f360d;p=php fix segfault in session_module_name() when session.save_handler is empty --- diff --git a/ext/session/session.c b/ext/session/session.c index 34d86f7658..cff31696af 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1337,11 +1337,21 @@ PHP_FUNCTION(session_module_name) } PS(mod_data) = NULL; - RETVAL_STRING(safe_estrdup(PS(mod)->s_name), 0); - + if (PS(mod) && PS(mod)->s_name) { + RETVAL_STRING(safe_estrdup(PS(mod)->s_name), 0); + } + else { + RETVAL_EMPTY_STRING(); + } + zend_alter_ini_entry("session.save_handler", sizeof("session.save_handler"), Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name), PHP_INI_USER, PHP_INI_STAGE_RUNTIME); } else { - RETURN_STRING(safe_estrdup(PS(mod)->s_name), 0); + if (PS(mod) && PS(mod)->s_name) { + RETURN_STRING(safe_estrdup(PS(mod)->s_name), 0); + } + else { + RETURN_EMPTY_STRING(); + } } } /* }}} */