diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-29 14:54:05 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-29 14:54:05 +0800 |
| commit | 60c742979dd04779437de83f7113f57a88a5d7f3 (patch) | |
| tree | f23fefc04af8bef50f82db2cb38fba6d842e846b /Zend/zend_object_handlers.c | |
| parent | a049180a731622673ca4467fb81fd0a5c955a6a1 (diff) | |
| parent | 17338ddb481e5a737f0ac3a4f0a9e5683a3bef4d (diff) | |
| download | php-git-60c742979dd04779437de83f7113f57a88a5d7f3.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Revert "ext/sodium: pwhash: do not warn on low parameters"
Conflicts:
Zend/zend_object_handlers.c
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 6764e1f3e3..4a78d796fe 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -660,13 +660,11 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ } zval_ptr_dtor(&tmp_object); goto exit; - } else { - if (Z_STRVAL_P(member)[0] == '\0' && Z_STRLEN_P(member) != 0) { - zval_ptr_dtor(&tmp_object); - zend_throw_error(NULL, "Cannot access property started with '\\0'"); - retval = &EG(uninitialized_zval); - goto exit; - } + } else if (Z_STRVAL_P(member)[0] == '\0' && Z_STRLEN_P(member) != 0) { + zval_ptr_dtor(&tmp_object); + zend_throw_error(NULL, "Cannot access property started with '\\0'"); + retval = &EG(uninitialized_zval); + goto exit; } } |