cvs: php-src(PHP_5_3) /ext/session mod_user.c mod_user.h php_session.h session.c

gwynne Fri Mar 7 23:20:32 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/session mod_user.c mod_user.h php_session.h session.c Log: MFH: fix bug #32330 (session_destroy, "Failed to initialize storage module", custom session handler) http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_user.c?r1=1.29.2.1.2.1.2.1&r2=1.29.2.1.2.1.2.2&diff_format=u Index: php-src/ext/session/mod_user.c diff -u php-src/ext/session/mod_user.c:1.29.2.1.2.1.2.1 php-src/ext/session/mod_user.c:1.29.2.1.2.1.2.2 --- php-src/ext/session/mod_user.c:1.29.2.1.2.1.2.1 Mon Dec 31 07:17:13 2007 +++ php-src/ext/session/mod_user.c Fri Mar 7 23:20:32 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_user.c,v 1.29.2.1.2.1.2.1 2007/12/31 07:17:13 sebastian Exp $ */ +/* $Id: mod_user.c,v 1.29.2.1.2.1.2.2 2008/03/07 23:20:32 gwynne Exp $ */ #include "php.h" #include "php_session.h" @@ -70,14 +70,17 @@ return retval; } -#define STDVARS \ +#define STDVARS1 \ zval *retval; \ - int ret = FAILURE; \ - ps_user *mdata = PS_GET_MOD_DATA(); \ + int ret = FAILURE + +#define STDVARS \ + STDVARS1; \ + char *mdata = PS_GET_MOD_DATA(); \ if (!mdata) \ return FAILURE -#define PSF(a) mdata->name.ps_##a +#define PSF(a) PS(mod_user_names).name.ps_##a #define FINISH \ if (retval) { \ @@ -90,27 +93,32 @@ PS_OPEN_FUNC(user) { zval *args[2]; - STDVARS; + static char dummy = 0; + STDVARS1; SESS_ZVAL_STRING(save_path, args[0]); SESS_ZVAL_STRING(session_name, args[1]); retval = ps_call_handler(PSF(open), 2, args TSRMLS_CC); + if (retval) { + /* This is necessary to fool the session module. Yes, it's safe to + * use a static. Neither mod_user nor the session module itself will + * ever touch this pointer. It could be set to 0xDEADBEEF for all the + * difference it makes, but for the sake of paranoia it's set to some + * valid value. + */ + PS_SET_MOD_DATA(&dummy); + } FINISH; } PS_CLOSE_FUNC(user) { - int i; - STDVARS; + STDVARS1; retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC); - for (i = 0; i < 6; i++) - zval_ptr_dtor(&mdata->names[i]); - efree(mdata); - PS_SET_MOD_DATA(NULL); FINISH; http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_user.h?r1=1.14.2.1.2.1.2.1&r2=1.14.2.1.2.1.2.2&diff_format=u Index: php-src/ext/session/mod_user.h diff -u php-src/ext/session/mod_user.h:1.14.2.1.2.1.2.1 php-src/ext/session/mod_user.h:1.14.2.1.2.1.2.2 --- php-src/ext/session/mod_user.h:1.14.2.1.2.1.2.1 Mon Dec 31 07:17:13 2007 +++ php-src/ext/session/mod_user.h Fri Mar 7 23:20:32 2008 @@ -16,23 +16,11 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_user.h,v 1.14.2.1.2.1.2.1 2007/12/31 07:17:13 sebastian Exp $ */ +/* $Id: mod_user.h,v 1.14.2.1.2.1.2.2 2008/03/07 23:20:32 gwynne Exp $ */ #ifndef MOD_USER_H #define MOD_USER_H -typedef union { - zval *names[6]; - struct { - zval *ps_open; - zval *ps_close; - zval *ps_read; - zval *ps_write; - zval *ps_destroy; - zval *ps_gc; - } name; -} ps_user; - extern ps_module ps_mod_user; #define ps_user_ptr &ps_mod_user http://cvs.php.net/viewvc.cgi/php-src/ext/session/php_session.h?r1=1.101.2.2.2.5.2.1&r2=1.101.2.2.2.5.2.2&diff_format=u Index: php-src/ext/session/php_session.h diff -u php-src/ext/session/php_session.h:1.101.2.2.2.5.2.1 php-src/ext/session/php_session.h:1.101.2.2.2.5.2.2 --- php-src/ext/session/php_session.h:1.101.2.2.2.5.2.1 Mon Dec 31 07:17:13 2007 +++ php-src/ext/session/php_session.h Fri Mar 7 23:20:32 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_session.h,v 1.101.2.2.2.5.2.1 2007/12/31 07:17:13 sebastian Exp $ */ +/* $Id: php_session.h,v 1.101.2.2.2.5.2.2 2008/03/07 23:20:32 gwynne Exp $ */ #ifndef PHP_SESSION_H #define PHP_SESSION_H @@ -112,6 +112,17 @@ long gc_maxlifetime; int module_number; long cache_expire; + union { + zval *names[6]; + struct { + zval *ps_open; + zval *ps_close; + zval *ps_read; + zval *ps_write; + zval *ps_destroy; + zval *ps_gc; + } name; + } mod_user_names; zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */ zend_bool bug_compat_warn; /* Whether to warn about it */ const struct ps_serializer_struct *serializer; http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.3&r2=1.417.2.8.2.40.2.4&diff_format=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.3 php-src/ext/session/session.c:1.417.2.8.2.40.2.4 --- php-src/ext/session/session.c:1.417.2.8.2.40.2.3 Mon Dec 31 07:17:13 2007 +++ php-src/ext/session/session.c Fri Mar 7 23:20:32 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.417.2.8.2.40.2.3 2007/12/31 07:17:13 sebastian Exp $ */ +/* $Id: session.c,v 1.417.2.8.2.40.2.4 2008/03/07 23:20:32 gwynne Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1489,7 +1489,6 @@ { zval **args[6]; int i; - ps_user *mdata; char *name; if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_array_ex(6, args) == FAILURE) @@ -1509,14 +1508,13 @@ zend_alter_ini_entry("session.save_handler", sizeof("session.save_handler"), "user", sizeof("user")-1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); - mdata = emalloc(sizeof(*mdata)); - for (i = 0; i < 6; i++) { + if (PS(mod_user_names).names[i] != NULL) { + zval_ptr_dtor(&PS(mod_user_names).names[i]); + } Z_ADDREF_PP(args[i]); - mdata->names[i] = *args[i]; + PS(mod_user_names).names[i] = *args[i]; } - - PS(mod_data) = (void *) mdata; RETURN_TRUE; } @@ -1870,6 +1868,7 @@ PS(id) = NULL; PS(session_status) = php_session_none; PS(mod_data) = NULL; + /* Do NOT init PS(mod_user_names) here! */ PS(http_session_vars) = NULL; } @@ -1879,6 +1878,7 @@ zval_ptr_dtor(&PS(http_session_vars)); PS(http_session_vars) = NULL; } + /* Do NOT destroy PS(mod_user_names) here! */ if (PS(mod_data)) { zend_try { PS(mod)->s_close(&PS(mod_data) TSRMLS_CC); @@ -1935,8 +1935,16 @@ PHP_RSHUTDOWN_FUNCTION(session) { + int i; + php_session_flush(TSRMLS_C); php_rshutdown_session_globals(TSRMLS_C); + /* this should NOT be done in php_rshutdown_session_globals() */ + for (i = 0; i < 6; i++) { + if (PS(mod_user_names).names[i] != NULL) { + zval_ptr_dtor(&PS(mod_user_names).names[i]); + } + } return SUCCESS; } @@ -1944,12 +1952,17 @@ static PHP_GINIT_FUNCTION(ps) { + int i; + ps_globals->save_path = NULL; ps_globals->session_name = NULL; ps_globals->id = NULL; ps_globals->mod = NULL; ps_globals->mod_data = NULL; ps_globals->session_status = php_session_none; + for (i = 0; i < 6; i++) { + ps_globals->mod_user_names.names[i] = NULL; + } ps_globals->http_session_vars = NULL; }