summaryrefslogtreecommitdiff
path: root/ext/standard/php_fopen_wrapper.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-10-08 12:35:47 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-10-08 12:35:47 +0200
commit41526976c59f6b011c0006e63b1ac15060d6b691 (patch)
tree84c537cd4e7d4a81b705406c6b8054543ba09169 /ext/standard/php_fopen_wrapper.c
parent8548a1bdec4dfdda8aaf77025c05d3c814fc5cff (diff)
parent196f9697ef0062577e82c51f4cc4904ee3ce6f06 (diff)
downloadphp-git-41526976c59f6b011c0006e63b1ac15060d6b691.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/standard/php_fopen_wrapper.c')
-rw-r--r--ext/standard/php_fopen_wrapper.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c
index 1b6a24b2b3..f525f868e4 100644
--- a/ext/standard/php_fopen_wrapper.c
+++ b/ext/standard/php_fopen_wrapper.c
@@ -372,6 +372,11 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa
}
efree(pathdup);
+ if (EG(exception)) {
+ php_stream_close(stream);
+ return NULL;
+ }
+
return stream;
} else {
/* invalid php://thingy */