diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-30 22:47:38 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-30 22:56:42 +0100 |
| commit | f77747b06c7623c4f673c75aebbe3372411a4275 (patch) | |
| tree | 3cc7bba3949818ab66f236111d221926d296d805 /main/streams | |
| parent | d1537e506edb48790c72a93e1d8505ef2c3e4dd3 (diff) | |
| download | php-git-f77747b06c7623c4f673c75aebbe3372411a4275.tar.gz | |
Properly propagate url_stat exceptions during include
Make sure we abort operations early, and that we don't emit
additional warnings or errors if an exception has been thrown.
Diffstat (limited to 'main/streams')
| -rw-r--r-- | main/streams/streams.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 495feab100..ce370941a8 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -2074,6 +2074,9 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(const char *path, const char *mod options |= STREAM_ASSUME_REALPATH; options &= ~USE_PATH; } + if (EG(exception)) { + return NULL; + } } path_to_open = path; |