From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 28 Jun 2018 04:38:26 +0000 (+0800)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha3~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e940654e10a5e79e7deb4272c0e75556ba9a032;p=php

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)
---

8e940654e10a5e79e7deb4272c0e75556ba9a032
diff --cc ext/reflection/php_reflection.c
index 347b9d83f8,9128f76d9d..861ee16e3e
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -4469,10 -4496,10 +4469,10 @@@ ZEND_METHOD(reflection_class, getConsta
  	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();
  		}
 -		val = zend_hash_add_new(Z_ARRVAL_P(return_value), key, &c->value);
 -		Z_TRY_ADDREF_P(val);
 +		ZVAL_COPY_OR_DUP(&val, &c->value);
 +		zend_hash_add_new(Z_ARRVAL_P(return_value), key, &val);
  	} ZEND_HASH_FOREACH_END();
  }
  /* }}} */