diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-08-22 12:22:16 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-08-22 12:22:16 +0000 |
| commit | 6b622046dc25b161706dbb25f6416a4f3ddf55ec (patch) | |
| tree | 134be93d8d80ed516f2587cab1224115083676db /ext/session/session.c | |
| parent | 6fad26469c9b0f539c51514d9a125ec34fc67ad8 (diff) | |
| download | php-git-6b622046dc25b161706dbb25f6416a4f3ddf55ec.tar.gz | |
zend_is_callable() and zend_make_callable() were changed to return readable function name as zval (instead of string).
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 1cc6a3a3ce..571c4523b6 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1377,7 +1377,7 @@ PHP_FUNCTION(session_set_save_handler) zval **args[6]; int i; ps_user *mdata; - char *name; + zval name; if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_array_ex(6, args) == FAILURE) WRONG_PARAM_COUNT; @@ -1388,10 +1388,10 @@ PHP_FUNCTION(session_set_save_handler) for (i = 0; i < 6; i++) { if (!zend_is_callable(*args[i], 0, &name)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument %d is not a valid callback", i+1); - efree(name); + zval_dtor(&name); RETURN_FALSE; } - efree(name); + zval_dtor(&name); } zend_alter_ini_entry("session.save_handler", sizeof("session.save_handler"), "user", sizeof("user")-1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); |