From e8f25c5b98fffa1bb4fd038ebba8da51a0abc541 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Tue, 7 Oct 2008 18:18:45 +0000 Subject: - MFH: Fixed bug #45575 (Segfault with invalid non-string as event handler callback) patch by Christian seiler --- ext/interbase/ibase_events.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ext/interbase/ibase_events.c') diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c index b0f5763d92..09cf99ef8c 100644 --- a/ext/interbase/ibase_events.c +++ b/ext/interbase/ibase_events.c @@ -260,7 +260,7 @@ PHP_FUNCTION(ibase_set_event_handler) * link resource id (int) as arguments. The value returned from the function is * used to determine if the event handler should remain set. */ - + char *cb_name; zval **args[17], **cb_arg; ibase_db_link *ib_link; ibase_event *event; @@ -312,11 +312,12 @@ PHP_FUNCTION(ibase_set_event_handler) } /* get the callback */ - if (!zend_is_callable(*cb_arg, 0, NULL TSRMLS_CC)) { - _php_ibase_module_error("Callback argument %s is not a callable function" - TSRMLS_CC, Z_STRVAL_PP(cb_arg)); + if (!zend_is_callable(*cb_arg, 0, &cb_name TSRMLS_CC)) { + _php_ibase_module_error("Callback argument %s is not a callable function" TSRMLS_CC, cb_name); + efree(cb_name); RETURN_FALSE; } + efree(cb_name); /* allocate the event resource */ event = (ibase_event *) safe_emalloc(sizeof(ibase_event), 1, 0); -- cgit v1.2.1