From: Pierre Joye <pajoye@php.net>
Date: Mon, 28 Mar 2011 16:43:49 +0000 (+0000)
Subject: -  Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent, windows fix
X-Git-Tag: php-5.4.0alpha1~191^2~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=264d2b348054f95772c91169b84edd89f9525108;p=php

-  Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent, windows fix
---

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