diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-13 13:18:14 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-13 13:28:24 +0800 |
| commit | da7d94cd73a1f654bf49b16b5d1bf221255710de (patch) | |
| tree | 7b7741213cb2f7ed9d8b687596ab41aa73b32c9a /sapi/phpdbg/phpdbg_utils.c | |
| parent | 5e7fd50376a3f44bd01ef1041fa0a251317c358c (diff) | |
| parent | adc42657922be5da0e7fe5ac53027c6c4960ae3e (diff) | |
| download | php-git-da7d94cd73a1f654bf49b16b5d1bf221255710de.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
ext/soap/soap.c
ext/standard/basic_functions.c
ext/zlib/zlib.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index 357905fa06..ecec950c1b 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -516,11 +516,7 @@ PHPDBG_API int phpdbg_parse_variable_with_arg(char *input, size_t len, HashTable } int phpdbg_is_auto_global(char *name, int len) { - int ret; - zend_string *str = zend_string_init(name, len, 0); - ret = zend_is_auto_global(str); - efree(str); - return ret; + return zend_is_auto_global_str(name, len); } static int phpdbg_xml_array_element_dump(zval *zv, zend_string *key, zend_ulong num) { |