com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/reflection/php_reflection.c
| From: | Christoph Michael Becker | Date: | Wed, 05 Sep 2018 13:10:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/reflection/php_reflection.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103007@lists.php.net to get a copy of this message | ||
Commit: 21cd552e1e6685048ed159091274a8311b84d4c8
Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 5 Sep 2018 15:10:27 +0200
Parents: 86c930e268759172d41f89a4f0148991dec27865 7a2c9585c47a9ddcff0cb8246d4981e086528877
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=21cd552e1e6685048ed159091274a8311b84d4c8
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #74454: Wrong exception being thrown when using ReflectionMethod
Bugs:
https://bugs.php.net/74454
Changed paths:
MM NEWS
MM ext/reflection/php_reflection.c
Diff:
diff --cc NEWS
index 0e2df8d,5186e6b..936ad95
--- a/NEWS
+++ b/NEWS
@@@ -18,29 -7,32 +18,33 @@@ PH
(Anatol)
- POSIX:
- . Fixed bug #75696 (posix_getgrnam fails to print details of group). (cmb)
+ Fixed bug #75696 (posix_getgrnam fails to print details of group). (cmb)
+ - Reflection:
+ . Fixed bug #74454 (Wrong exception being thrown when using ReflectionMethod).
+ (cmb)
+
- Standard:
+ . Fixed bug #76803 (ftruncate changes file pointer). (Anatol)
+ . Fixed bug #76818 (Memory corruption and segfault). (Remi)
. Fixed bug #73457 (Wrong error message when fopen FTP wrapped fails to open
data connection). (Ville Hukkamäki)
- . Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with
- stream_socket_client). (Ville Hukkamäki)
-13 Sep 2018, PHP 7.2.10
+30 Aug 2018, PHP 7.3.0beta3
- Core:
+ . Fixed #76773 (Traits used on the parent are ignored for child classes).
+ (daverandom)
+ . Fixed #76767 (‘asm’ operand has impossible constraints in zend_operators.h).
+ (ondrej)
. Fixed bug #76754 (parent private constant in extends class memory leak).
(Laruence)
- . Fixed bug #72443 (Generate enabled extension). (petk)
- . Fixed bug #75797 (Memory leak when using class_alias() in non-debug mode).
- (Massimiliano Braglia)
-
-- Bz2:
- . Fixed arginfo for bzcompress. (Tyson Andre)
+ . Fixed bug #76752 (Crash in ZEND_COALESCE_SPEC_TMP_HANDLER - assertion in
+ _get_zval_ptr_tmp failed). (Laruence)
-- gettext:
- . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)
+- DOM:
+ . Fixed bug #76285 (DOMDocument::formatOutput attribute sometimes ignored).
+ (Andrew Nester, Laruence, Anatol)
- iconv:
. Fixed bug #68180 (iconv_mime_decode can return extra characters in a
diff --cc ext/reflection/php_reflection.c
index 862936d,3bd31e4..c2f6e19
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -2973,10 -3010,12 +2973,12 @@@ ZEND_METHOD(reflection_method, __constr
switch (Z_TYPE_P(classname)) {
case IS_STRING:
if ((ce = zend_lookup_class(Z_STR_P(classname))) == NULL) {
- zend_throw_exception_ex(reflection_exception_ptr, 0,
- "Class %s does not exist", Z_STRVAL_P(classname));
+ if (!EG(exception)) {
+ zend_throw_exception_ex(reflection_exception_ptr, 0,
+ "Class %s does not exist", Z_STRVAL_P(classname));
+ }
if (classname == &ztmp) {
- zval_dtor(&ztmp);
+ zval_ptr_dtor_str(&ztmp);
}
return;
}