MFB: Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using

TMPDIR).

diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index ee7f0df75f3668db954a405c00a2bafed4b18cb0..af86a0b6909e8f9745bce9cc9b4b62ba3b4e6b45 100644 (file)
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -200,7 +200,14 @@ PHPAPI const char* php_get_temporary_directory(void)
        {
                char* s = getenv("TMPDIR");
                if (s) {
-                       temporary_directory = strdup(s);
+                       int len = strlen(s);
+
+                       if (s[len - 1] == DEFAULT_SLASH) {
+                               temporary_directory = zend_strndup(s, len - 1);
+                       } else {
+                               temporary_directory = zend_strndup(s, len);
+                       }
+
                        return temporary_directory;
                }
        }