Browse Source

no need to fetch name and free it immediately after that

the patch also fixes a segfault
migration/RELEASE_1_0_0
Antony Dovgal 20 years ago
parent
commit
012a0e74ed
  1. 7
      ext/filter/callback_filter.c

7
ext/filter/callback_filter.c

@ -22,21 +22,16 @@
void php_filter_callback(PHP_INPUT_FILTER_PARAM_DECL)
{
char *name = NULL;
zval *retval_ptr;
zval ***args;
int status;
if (!option_array || !zend_is_callable(option_array, IS_CALLABLE_CHECK_NO_ACCESS, &name)) {
if (!option_array || !zend_is_callable(option_array, IS_CALLABLE_CHECK_NO_ACCESS, NULL)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argument is expected to be a valid callback");
if (name) {
efree(name);
}
zval_dtor(value);
Z_TYPE_P(value) = IS_NULL;
return;
}
efree(name);
args = safe_emalloc(sizeof(zval **), 1, 0);
args[0] = &value;

Loading…
Cancel
Save