diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-09 12:03:29 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-09 12:03:29 +0200 |
commit | 969f23880892000e2c4baf7cd51b89ef98aa3048 (patch) | |
tree | 0f10664bd21fb39d7472f8d59986210654e63f89 /ext/reflection/php_reflection.c | |
parent | a7bd736c2c262d549d9703bfdfb278e3ec54721f (diff) | |
parent | 54be40113d77f41cbf5a5078a265279140511c52 (diff) | |
download | php-git-969f23880892000e2c4baf7cd51b89ef98aa3048.tar.gz |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/reflection/php_reflection.c')
-rw-r--r-- | ext/reflection/php_reflection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 539e764555..dc96522b55 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -6166,7 +6166,8 @@ ZEND_METHOD(reflection_reference, fromArrayElement) return; } - if (Z_TYPE_P(item) != IS_REFERENCE) { + /* Treat singleton reference as non-reference. */ + if (Z_TYPE_P(item) != IS_REFERENCE || Z_REFCOUNT_P(item) == 1) { RETURN_NULL(); } |