diff options
| author | Arpad Ray <arraypad@gmail.com> | 2013-07-19 19:19:48 +0100 |
|---|---|---|
| committer | Arpad Ray <arraypad@gmail.com> | 2013-07-19 19:19:48 +0100 |
| commit | a015fa83a735da7342dd7ae172c4516265bed41d (patch) | |
| tree | 4f9ba30e1ccc0bab72ce8d11202f95c4da652eb7 /Zend/zend_builtin_functions.c | |
| parent | 2b9d42433f8e634593c2306d5d0ef61cc44281bf (diff) | |
| download | php-git-a015fa83a735da7342dd7ae172c4516265bed41d.tar.gz | |
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index f29676bac0..1aba64e102 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1926,6 +1926,11 @@ static int add_constant_info(zend_constant *constant, void *arg TSRMLS_DC) zval *name_array = (zval *)arg; zval *const_val; + if (!constant->name) { + /* skip special constants */ + return 0; + } + MAKE_STD_ZVAL(const_val); *const_val = constant->value; zval_copy_ctor(const_val); |