diff options
| author | Pierre Joye <pajoye@php.net> | 2010-11-18 15:22:22 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-11-18 15:22:22 +0000 |
| commit | ce96fd6b0761d98353761bf78d5bfb55291179fd (patch) | |
| tree | 0b66c858477f5ac7472bf35b842f89cdf4dce151 /ext/posix/posix.c | |
| parent | 75631ab8ac231f141286428fd871ad31f2d71588 (diff) | |
| download | php-git-ce96fd6b0761d98353761bf78d5bfb55291179fd.tar.gz | |
- fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus
Diffstat (limited to 'ext/posix/posix.c')
| -rw-r--r-- | ext/posix/posix.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ext/posix/posix.c b/ext/posix/posix.c index aeaae224b2..b4ba1aff0b 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -842,6 +842,10 @@ PHP_FUNCTION(posix_mkfifo) RETURN_FALSE; } + if (strlen(path) != path_len) { + RETURN_FALSE; + } + if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) || (PG(safe_mode) && (!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_DIR)))) { RETURN_FALSE; @@ -877,6 +881,10 @@ PHP_FUNCTION(posix_mknod) RETURN_FALSE; } + if (strlen(path) != path_len) { + RETURN_FALSE; + } + if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) || (PG(safe_mode) && (!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_DIR)))) { RETURN_FALSE; @@ -957,6 +965,10 @@ PHP_FUNCTION(posix_access) RETURN_FALSE; } + if (strlen(filename) != filename_len) { + RETURN_FALSE; + } + path = expand_filepath(filename, NULL TSRMLS_CC); if (!path) { POSIX_G(last_error) = EIO; |