diff options
| author | Adam Harvey <aharvey@php.net> | 2010-11-05 05:28:07 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2010-11-05 05:28:07 +0000 |
| commit | 7f0d3f7d70e3fd2fa08d25e5b977bf16aced09d0 (patch) | |
| tree | e4295d71734e65f6872b0edd33170eb7aaca0957 | |
| parent | 83657396630f792b784828f36ac4ac39e26cf674 (diff) | |
| download | php-git-7f0d3f7d70e3fd2fa08d25e5b977bf16aced09d0.tar.gz | |
Fix bug #53226 (file_exists fails on big filenames).
| -rw-r--r-- | main/fopen_wrappers.c | 8 | ||||
| -rw-r--r-- | tests/security/bug53226.phpt | 31 |
2 files changed, 39 insertions, 0 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index f8679d5675..5424f78970 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -291,6 +291,14 @@ PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC) char *ptr; char *end; + /* Check if the path is too long so we can give a more useful error + * message. */ + if (strlen(path) > (MAXPATHLEN - 1)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "File name is longer than the maximum allowed path length on this platform (%d): %s", MAXPATHLEN, path); + errno = EINVAL; + return -1; + } + pathbuf = estrdup(PG(open_basedir)); ptr = pathbuf; diff --git a/tests/security/bug53226.phpt b/tests/security/bug53226.phpt new file mode 100644 index 0000000000..e462d3e9d7 --- /dev/null +++ b/tests/security/bug53226.phpt @@ -0,0 +1,31 @@ +--TEST-- +Bug #53226 (file_exists fails on big filenames) +--INI-- +open_basedir=. +--FILE-- +<?php +require_once "open_basedir.inc"; +create_directories(); + +var_dump(file_exists('./test/ok/ok.txt')); +var_dump(file_exists('./test/foo')); + +// Picked an arbitrarily large number that should be beyond PATH_MAX on every +// OS I know about. +$file = str_repeat('x', 40000); +var_dump(file_exists("./test/$file")); +?> +--CLEAN-- +<?php +require_once "open_basedir.inc"; +delete_directories(); +?> +--EXPECTF-- +bool(true) +bool(true) +bool(true) +bool(true) +bool(false) + +Warning: file_exists(): File name is longer than the maximum allowed path length on this platform (%d): %s in %s on line %d +bool(false) |