iliaal · iliaal · commit c0aa23fd866b · 2009-06-24T12:21:45.000Z
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
@@ -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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,14 @@ PHPAPI const char* php_get_temporary_directory(void)`
`200`	`200`	`{`
`201`	`201`	`char* s = getenv("TMPDIR");`
`202`	`202`	`if (s) {`
`203`		`- temporary_directory = strdup(s);`
	`203`	`+ int len = strlen(s);`
	`204`	`+`
	`205`	`+ if (s[len - 1] == DEFAULT_SLASH) {`
	`206`	`+ temporary_directory = zend_strndup(s, len - 1);`
	`207`	`+ } else {`
	`208`	`+ temporary_directory = zend_strndup(s, len);`
	`209`	`+ }`
	`210`	`+`
`204`	`211`	`return temporary_directory;`
`205`	`212`	`}`
`206`	`213`	`}`