summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2005-01-09 17:42:02 +0000
committerAntony Dovgal <tony2001@php.net>2005-01-09 17:42:02 +0000
commitc644b2a5a18c7f3e1fc1e466fa359a7bec0cb253 (patch)
treebf91a536191a39c1e3ce5022c7b89c56bfdbac0e /ext
parent6ffb0dcaf2f3dc1194522afe0c5af226bd757e31 (diff)
downloadphp-git-c644b2a5a18c7f3e1fc1e466fa359a7bec0cb253.tar.gz
fix bug #31454 (session_set_save_handler crashes PHP when supplied non-existent object ref)
Diffstat (limited to 'ext')
-rw-r--r--ext/session/session.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index 26181a87dd..c673412d06 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1361,6 +1361,7 @@ PHP_FUNCTION(session_set_save_handler)
zval **args[6];
int i;
ps_user *mdata;
+ char *name;
if (ZEND_NUM_ARGS() != 6 || zend_get_parameters_array_ex(6, args) == FAILURE)
WRONG_PARAM_COUNT;
@@ -1368,6 +1369,14 @@ PHP_FUNCTION(session_set_save_handler)
if (PS(session_status) != php_session_none)
RETURN_FALSE;
+ 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);
+ RETURN_FALSE;
+ }
+ }
+
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));