summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-09-22 18:57:21 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-09-23 10:54:06 +0200
commit2576c57a5133df757c51f341e794bf53add7663f (patch)
tree1c66ac4d095e5f7e147eec55131d6608a8be2b7e /main
parent9439d65f0d74d391f9620491896a1a04bc033648 (diff)
downloadphp-git-2576c57a5133df757c51f341e794bf53add7663f.tar.gz
Fix #76735: Incorrect message in fopen on invalid mode
We have to log errors in `stream_opener` callbacks to the wrapper's error log, because otherwise we may pick up an unrelated `errno` or a most generic message. Closes GH-6187.
Diffstat (limited to 'main')
-rw-r--r--main/streams/plain_wrapper.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index d00a6efe29..131f77c421 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -1021,9 +1021,7 @@ PHPAPI php_stream *_php_stream_fopen(const char *filename, const char *mode, zen
char *persistent_id = NULL;
if (FAILURE == php_stream_parse_fopen_modes(mode, &open_flags)) {
- if (options & REPORT_ERRORS) {
- php_error_docref(NULL, E_WARNING, "`%s' is not a valid mode for fopen", mode);
- }
+ php_stream_wrapper_log_error(&php_plain_files_wrapper, options, "`%s' is not a valid mode for fopen", mode);
return NULL;
}