diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-15 10:25:27 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-15 10:25:27 +0200 |
| commit | 2e186aa9dc32c345641272f9e4ad39c1c6f381b3 (patch) | |
| tree | 7277840f340ff85d3d57f3fdd71a256303822dc2 /ext/reflection/php_reflection.c | |
| parent | 9d38510ab4aab7fd8748edd4e3a5cf9bfa0428f3 (diff) | |
| parent | b2ec07e64c7a05a21da0f88acce62592becda87e (diff) | |
| download | php-git-2e186aa9dc32c345641272f9e4ad39c1c6f381b3.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 3928f4c755..9ae20f6bc7 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4671,6 +4671,10 @@ ZEND_METHOD(reflection_class, newInstance) for (i = 0; i < num_args; i++) { zval_ptr_dtor(¶ms[i]); } + + if (EG(exception)) { + zend_object_store_ctor_failed(Z_OBJ_P(return_value)); + } if (ret == FAILURE) { php_error_docref(NULL, E_WARNING, "Invocation of %s's constructor failed", ZSTR_VAL(ce->name)); zval_ptr_dtor(return_value); @@ -4771,6 +4775,10 @@ ZEND_METHOD(reflection_class, newInstanceArgs) } efree(params); } + + if (EG(exception)) { + zend_object_store_ctor_failed(Z_OBJ_P(return_value)); + } if (ret == FAILURE) { zval_ptr_dtor(&retval); php_error_docref(NULL, E_WARNING, "Invocation of %s's constructor failed", ZSTR_VAL(ce->name)); |