diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-08 12:35:35 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-08 12:35:35 +0200 |
| commit | 196f9697ef0062577e82c51f4cc4904ee3ce6f06 (patch) | |
| tree | 0b9912fc0ec1146ef618aed4cc8ab38c7886664b /main | |
| parent | 346be2cf591ecc5e1f673ead407b265bd834d429 (diff) | |
| parent | 2fdd142f9941a05bdcffb0d6c11662ec333e6e09 (diff) | |
| download | php-git-196f9697ef0062577e82c51f4cc4904ee3ce6f06.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/streams.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 1f6fc89a79..495feab100 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -152,10 +152,16 @@ static zend_llist *php_get_wrapper_errors_list(php_stream_wrapper *wrapper) /* {{{ wrapper error reporting */ void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *path, const char *caption) { - char *tmp = estrdup(path); + char *tmp; char *msg; int free_msg = 0; + if (EG(exception)) { + /* Don't emit additional warnings if an exception has already been thrown. */ + return; + } + + tmp = estrdup(path); if (wrapper) { zend_llist *err_list = php_get_wrapper_errors_list(wrapper); if (err_list) { |