From: Derick Rethans <derick@php.net>
Date: Thu, 27 Oct 2005 09:27:34 +0000 (+0000)
Subject: - Fixed a crash when a non-array option was passed in combination with the
X-Git-Tag: RELEASE_0_9_2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50e247999df0f4a2c1d0a94aa5bc7a830bc902ef;p=php

- 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 79ed4f5b51..446d72e56e 100644
--- 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;