diff options
| author | Pierre Joye <pajoye@php.net> | 2011-03-28 16:43:49 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-03-28 16:43:49 +0000 |
| commit | 264d2b348054f95772c91169b84edd89f9525108 (patch) | |
| tree | c4e28253ef09fb98fe1fc0c96dedea33d5700eb7 /main/php_open_temporary_file.c | |
| parent | 0625b3882d965b88116416ff0a336ac35a7021d0 (diff) | |
| download | php-git-264d2b348054f95772c91169b84edd89f9525108.tar.gz | |
- Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent, windows fix
Diffstat (limited to 'main/php_open_temporary_file.c')
| -rw-r--r-- | main/php_open_temporary_file.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c index 458f2bf405..14bb3d6149 100644 --- a/main/php_open_temporary_file.c +++ b/main/php_open_temporary_file.c @@ -204,9 +204,13 @@ PHPAPI const char* php_get_temporary_directory(void) */ { char sTemp[MAX_PATH]; - DWORD n = GetTempPath(sizeof(sTemp),sTemp); - assert(0 < n); /* should *never* fail! */ - temporary_directory = strdup(sTemp); + DWORD len = GetTempPath(sizeof(sTemp),sTemp); + assert(0 < len); /* should *never* fail! */ + if (sTemp[len - 1] == DEFAULT_SLASH) { + temporary_directory = zend_strndup(sTemp, len - 1); + } else { + temporary_directory = zend_strndup(sTemp, len); + } return temporary_directory; } #else |