diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-04-03 12:38:53 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-04-03 12:38:53 +0100 |
| commit | bff13d90a8f27d0d37b1969259d5893dce9d00cc (patch) | |
| tree | cde1d62bf77a466ed5bbf12a75d0ca32c14d499e /Zend/zend_compile.c | |
| parent | c72282a13b12b7e572469eba7a7ce593d900a8a2 (diff) | |
| parent | 91c10662c887c0e0a80844b1655cf329c5c58352 (diff) | |
| download | php-git-bff13d90a8f27d0d37b1969259d5893dce9d00cc.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
fix #69537: __debugInfo with empty string for key gives error
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 1401a6e051..5f3114d10e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1314,7 +1314,7 @@ ZEND_API int zend_unmangle_property_name_ex(const zend_string *name, const char *class_name = NULL; - if (ZSTR_VAL(name)[0] != '\0') { + if (!ZSTR_LEN(name) || ZSTR_VAL(name)[0] != '\0') { *prop_name = ZSTR_VAL(name); if (prop_len) { *prop_len = ZSTR_LEN(name); |