From f77747b06c7623c4f673c75aebbe3372411a4275 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 30 Dec 2019 22:47:38 +0100 Subject: 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. --- main/streams/streams.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'main/streams') 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; -- cgit v1.2.1