Fix bug #53226 (file_exists fails on big filenames).

diff --git a/NEWS b/NEWS
index e17a2582dfc6ae212cefa2b745061eede82e2e23..c9098d7a75561910ae9586077bc809c4096906b9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,7 @@
 
 - Fixed bug #53241 (stream casting that relies on fdopen/fopencookie fails
   with streams opened with, inter alia, the 'xb' mode). (Gustavo)
+- Fixed bug #53226 (file_exists fails on big filenames). (Adam)
 - Fixed bug #53198 (changing INI setting "from" with ini_set did not have any
   effect). (Gustavo)
 - Fixed bug #53180 (post_max_size=0 not disabling the limit when the content

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 41f3127863425676fc1e76ea210d2b4f43599521..8bc649ef55553451d82221c8215cc8524a9e6935 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -292,6 +292,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 (file)
index 0000000..e462d3e
--- /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)