diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-05-23 23:22:04 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-05-23 23:22:04 +0000 |
| commit | cd8c7a3e09a46a02c7ca619bfcb1ff52648c5310 (patch) | |
| tree | 030da5ebfe8ac8f5f1edab0eaa0cd51ad7db3c53 | |
| parent | 59d2ce8258a6d519fa8b9f7f636cf23c025bae2f (diff) | |
| download | php-git-cd8c7a3e09a46a02c7ca619bfcb1ff52648c5310.tar.gz | |
Fixed handling of extremely long paths inside tempnam() function.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | main/php_open_temporary_file.c | 9 |
2 files changed, 5 insertions, 5 deletions
@@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2006, PHP 5.2.0 +- Fixed handling of extremely long paths inside tempnam() function. (Ilia) - Added control character checks for cURL extension's open_basedir/safe_mode checks. (Ilia) - Disable realpath cache when open_basedir or safe_mode are enabled on a diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c index 66453581fb..b2e27e2f79 100644 --- a/main/php_open_temporary_file.c +++ b/main/php_open_temporary_file.c @@ -114,17 +114,16 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char ** path_len = strlen(path); - if (!(opened_path = emalloc(MAXPATHLEN))) { - return -1; - } - if (!path_len || IS_SLASH(path[path_len - 1])) { trailing_slash = ""; } else { trailing_slash = "/"; } - (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx); + if (spprintf(&opened_path, 0, "%s%s%sXXXXXX", path, trailing_slash, pfx) >= MAXPATHLEN) { + efree(opened_path); + return -1; + } #ifdef PHP_WIN32 if (GetTempFileName(path, pfx, 0, opened_path)) { |