From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 13 Oct 2006 01:11:30 +0000 (+0000)
Subject: Improve open_basedir checks
X-Git-Tag: php-5.2.0RC6~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bd16e2b5890b6006d8362da0acb615053352ec7;p=php

Improve open_basedir checks
---

diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index 63f4e2c06b..3132b9360e 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -206,7 +206,7 @@ PHPAPI const char* php_get_temporary_directory(void)
 PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC)
 {
 	int fd;
-	const char *temp_dir = php_get_temporary_directory();
+	const char *temp_dir;
 
 	if (!pfx) {
 		pfx = "tmp.";
@@ -216,6 +216,9 @@ PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened
 	}
 
 	if (!dir || *dir == '\0') {
+def_tmp:
+		temp_dir = php_get_temporary_directory();
+
 		if (temp_dir && *temp_dir != '\0' && !php_check_open_basedir(temp_dir TSRMLS_CC)) {
 			return php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);
 		} else {
@@ -227,7 +230,7 @@ PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened
 	fd = php_do_open_temporary_file(dir, pfx, opened_path_p TSRMLS_CC);
 	if (fd == -1) {
 		/* Use default temporary directory. */
-		fd = php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);
+		goto def_tmp;
 	}
 	return fd;
 }