diff options
| author | Sara Golemon <pollita@php.net> | 2017-01-09 16:08:31 -0800 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-01-09 16:08:31 -0800 |
| commit | 4fb70c7577a1df8615091d04e72a32fbf61c9b71 (patch) | |
| tree | b83e8f5f9f788d5403a0b3f0f2871731a6152d9b /main | |
| parent | 18904aa3e2fa73a43c5b1b552134cf38a0302f7c (diff) | |
| parent | 005ba2001ddc0e84ae62e00aa4956899f85c50f8 (diff) | |
| download | php-git-4fb70c7577a1df8615091d04e72a32fbf61c9b71.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix open_basedir check for glob:// opendir wrapper
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/glob_wrapper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index 9c738b7c04..1350962837 100644 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c @@ -213,10 +213,6 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, const cha int ret; const char *tmp, *pos; - if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path)) { - return NULL; - } - if (!strncmp(path, "glob://", sizeof("glob://")-1)) { path += sizeof("glob://")-1; if (opened_path) { @@ -224,6 +220,10 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, const cha } } + if (((options & STREAM_DISABLE_OPEN_BASEDIR) == 0) && php_check_open_basedir(path)) { + return NULL; + } + pglob = ecalloc(sizeof(*pglob), 1); if (0 != (ret = glob(path, pglob->flags & GLOB_FLAGMASK, NULL, &pglob->glob))) { |