Improve open_basedir checks

Ilia Alshanetsky · Ilia Alshanetsky · commit 8bd16e2b5890 · 2006-10-13T01:11:30.000Z
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ PHPAPI const char* php_get_temporary_directory(void)`
`206`	`206`	`PHPAPI int php_open_temporary_fd(const char dir, const char pfx, char **opened_path_p TSRMLS_DC)`
`207`	`207`	`{`
`208`	`208`	`int fd;`
`209`		`- const char *temp_dir = php_get_temporary_directory();`
	`209`	`+ const char *temp_dir;`
`210`	`210`
`211`	`211`	`if (!pfx) {`
`212`	`212`	`pfx = "tmp.";`
`@@ -216,6 +216,9 @@ PHPAPI int php_open_temporary_fd(const char dir, const char pfx, char **opened`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`if (!dir \|\| *dir == '\0') {`
	`219`	`+def_tmp:`
	`220`	`+ temp_dir = php_get_temporary_directory();`
	`221`	`+`
`219`	`222`	`if (temp_dir && *temp_dir != '\0' && !php_check_open_basedir(temp_dir TSRMLS_CC)) {`
`220`	`223`	`return php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);`
`221`	`224`	`} else {`
`@@ -227,7 +230,7 @@ PHPAPI int php_open_temporary_fd(const char dir, const char pfx, char **opened`
`227`	`230`	`fd = php_do_open_temporary_file(dir, pfx, opened_path_p TSRMLS_CC);`
`228`	`231`	`if (fd == -1) {`
`229`	`232`	`/* Use default temporary directory. */`
`230`		`- fd = php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);`
	`233`	`+ goto def_tmp;`
`231`	`234`	`}`
`232`	`235`	`return fd;`
`233`	`236`	`}`