diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-09-11 11:56:45 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-09-11 11:56:45 +0300 |
| commit | 3a249e769b293afa454b18b8d894c3395683d26c (patch) | |
| tree | 93d89c66728cb981136572bbc79e5a1ae756315a /Zend/zend_builtin_functions.c | |
| parent | c4b14370cfc6884005d7976cf75af007e6f24e14 (diff) | |
| download | php-git-3a249e769b293afa454b18b8d894c3395683d26c.tar.gz | |
Squashed commit of the following:
commit 2d3cac9e005d6bef9aa73ab57cc674aa53125954
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 11:54:47 2018 +0300
Fixed static property access
commit 31786ee27282f319f3ef2a07635b1f325cbd67c6
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 11:05:29 2018 +0300
Avoid duplicate checks
commit 5ae502b979ea33d058d01a9421eec5afd0084e8d
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 10:39:17 2018 +0300
Optimization
commit 82c17f0e8af02c9cf7d1bbdae4e3158330148203
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 09:26:50 2018 +0300
Removed unused zend_duplicate_property_info()
commit ba53d1d0dd91d5530328a11cac93ff9e75c462b5
Merge: eacc11b8fd c4b14370cf
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 09:24:13 2018 +0300
Merge branch 'master' into shadow
* master:
7.0.33 next
Sync NEWS [ci skip]
add NEWS for 76582
Enforce ordering of property compare in object comparisons
Fixed wrong assertion
Skip test on unsuitable env
commit eacc11b8fdeb002ee6a149defd8b5a8c3412896a
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Sep 10 13:12:39 2018 +0300
Fixed failure of ext/spl/tests/array_017.phpt
commit 62d1871430a1b81c84b790460afff0682648689a
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Sep 10 11:55:07 2018 +0300
Fixed issues
commit 1d37e3a40e4d07c4b933ed6f9d2e649dd01180f0
Merge: d6c3f098b6 1e550e6f7e
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Sep 10 10:21:20 2018 +0300
Merge branch 'master' into shadow
* master:
Update NEWS
Fix for bug #76582
Fix ssl stream reneg limit test to print only after first renegotiation
Make a copy unconditionally
Fix memory leak in pcre cache
Remove not needed checking for <errno.h>
Remove HAVE_ASSERT_H
Add test for bug #76850
Fixed bug #76850 Exit code mangled by set locale/preg_match
Remove empty PHP tags from test
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Fix PCRE2 exclusion and remove dead libs in Makefile.gcov
Report mem leaks to stderr if no Win debugger is present
Use combined assignment contanation operator
Fixed bug #76796
Support fixed address mmap without replacement
commit d6c3f098b6015e76d042691de0af2e1426c66829
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Sep 7 13:56:30 2018 +0300
Get rid of ZEND_ACC_SHADOW
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index d83169cac8..88c24ba8ae 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1097,13 +1097,10 @@ static void add_class_vars(zend_class_entry *scope, zend_class_entry *ce, int st zend_string *key; ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->properties_info, key, prop_info) { - if (((prop_info->flags & ZEND_ACC_SHADOW) && - prop_info->ce != scope) || - ((prop_info->flags & ZEND_ACC_PROTECTED) && + if (((prop_info->flags & ZEND_ACC_PROTECTED) && !zend_check_protected(prop_info->ce, scope)) || ((prop_info->flags & ZEND_ACC_PRIVATE) && - ce != scope && - prop_info->ce != scope)) { + prop_info->ce != scope)) { continue; } prop = NULL; @@ -1403,8 +1400,10 @@ ZEND_FUNCTION(property_exists) RETURN_NULL(); } - if ((property_info = zend_hash_find_ptr(&ce->properties_info, property)) != NULL - && (property_info->flags & ZEND_ACC_SHADOW) == 0) { + property_info = zend_hash_find_ptr(&ce->properties_info, property); + if (property_info != NULL + && (!(property_info->flags & ZEND_ACC_PRIVATE) + || property_info->ce == ce)) { RETURN_TRUE; } |