From 264d2b348054f95772c91169b84edd89f9525108 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 28 Mar 2011 16:43:49 +0000 Subject: [PATCH] - Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent, windows fix --- main/php_open_temporary_file.c | 10 +++++++--- 1 file 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 -- 2.50.1