- Fixed a crash when a non-array option was passed in combination with the

  callback filter.

diff --git a/ext/filter/callback_filter.c b/ext/filter/callback_filter.c
index 79ed4f5b51ac8cd714004d009a4b34650e39f6a3..446d72e56eec2a42fee4c6666b46c78715de6db9 100644 (file)
--- a/ext/filter/callback_filter.c
+++ b/ext/filter/callback_filter.c
@@ -22,9 +22,9 @@ void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
 {
        char *name;
        zval *args[1];
-       
-       if (!zend_is_callable(option_array, IS_CALLABLE_CHECK_NO_ACCESS, &name)) {
-               php_error_docref1(NULL TSRMLS_CC, name, E_WARNING, "First argument is expected to be a valid callback");
+
+       if (!option_array || !zend_is_callable(option_array, IS_CALLABLE_CHECK_NO_ACCESS, &name)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argument is expected to be a valid callback");
                efree(name);
                Z_TYPE_P(value) = IS_NULL;
                return;