diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-06-28 12:38:26 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-06-28 12:38:26 +0800 |
| commit | 8e940654e10a5e79e7deb4272c0e75556ba9a032 (patch) | |
| tree | ce6caf714e8638e3951ebf376fdd87cb03beb821 /ext/reflection/php_reflection.c | |
| parent | bddb085a68e11c9d7dc781d93fc6c0476163c4a2 (diff) | |
| parent | 809a7b5f8fce3821af3590221c372626cdc37a2e (diff) | |
| download | php-git-8e940654e10a5e79e7deb4272c0e75556ba9a032.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #76536 (PHP crashes with core dump when throwing exception in error handler). (Laruence)
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 347b9d83f8..861ee16e3e 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4469,7 +4469,7 @@ ZEND_METHOD(reflection_class, getConstants) ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->constants_table, key, c) { if (UNEXPECTED(zval_update_constant_ex(&c->value, ce) != SUCCESS)) { zend_array_destroy(Z_ARRVAL_P(return_value)); - return; + RETURN_NULL(); } ZVAL_COPY_OR_DUP(&val, &c->value); zend_hash_add_new(Z_ARRVAL_P(return_value), key, &val); |