diff options
| author | Zeev Suraski <zeev@php.net> | 1999-12-22 18:49:23 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-12-22 18:49:23 +0000 |
| commit | 1fe57c950519a0520dcf7b5ea7875b27d6934b73 (patch) | |
| tree | 7512e1fcb3339082f5cb87ee61137e56f4c6e7a2 /Zend/zend_builtin_functions.c | |
| parent | 5939b3d702443d6cd75969a5e1246b713b0c494d (diff) | |
| download | php-git-1fe57c950519a0520dcf7b5ea7875b27d6934b73.tar.gz | |
- Fix function_exists()
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 30eb342ff1..5a808515a7 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -485,7 +485,8 @@ ZEND_FUNCTION(function_exists) { zval **function_name; char *lcname; - CLS_FETCH(); + int retval; + ELS_FETCH(); if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &function_name)==FAILURE) { WRONG_PARAM_COUNT; @@ -493,13 +494,11 @@ ZEND_FUNCTION(function_exists) convert_to_string_ex(function_name); lcname = estrndup((*function_name)->value.str.val, (*function_name)->value.str.len); zend_str_tolower(lcname, (*function_name)->value.str.len); - if (zend_hash_exists(CG(function_table), lcname, (*function_name)->value.str.len+1) == FAILURE) { - efree(lcname); - RETURN_FALSE; - } else { - efree(lcname); - RETURN_TRUE; - } + + retval = zend_hash_exists(EG(function_table), lcname, (*function_name)->value.str.len+1); + efree(lcname); + + RETURN_BOOL(retval); } /* }}} */ |