Fixed handling of extremely long paths inside tempnam() function.

This commit is contained in:
Ilia Alshanetsky 2006-05-23 23:22:04 +00:00
parent 59d2ce8258
commit cd8c7a3e09
2 changed files with 5 additions and 5 deletions

1
NEWS
View File

@ -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

View File

@ -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)) {