summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-03-07 12:28:29 +0100
committerAnatol Belski <ab@php.net>2018-03-07 12:28:29 +0100
commit281e2f8207120ed47f6fbce53cc48e0e1fa8cb1f (patch)
tree2d9c2ba4391583c1b2f417378011d09ff8c12b07
parent8a57fcdfbd52b4656b43a4d60a7018bee95cc747 (diff)
downloadphp-git-281e2f8207120ed47f6fbce53cc48e0e1fa8cb1f.tar.gz
Guard platform dependent code
-rw-r--r--main/php_open_temporary_file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index 713d8063e8..8bb6fcd338 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -97,13 +97,13 @@
static int php_do_open_temporary_file(const char *path, const char *pfx, zend_string **opened_path_p)
{
- char *trailing_slash;
#ifdef PHP_WIN32
char *opened_path = NULL;
size_t opened_path_len;
wchar_t *cwdw, *pfxw, pathw[MAXPATHLEN];
#else
char opened_path[MAXPATHLEN];
+ char *trailing_slash;
#endif
char cwd[MAXPATHLEN];
cwd_state new_state;
@@ -139,13 +139,13 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, zend_st
return -1;
}
+#ifndef PHP_WIN32
if (IS_SLASH(new_state.cwd[new_state.cwd_length - 1])) {
trailing_slash = "";
} else {
trailing_slash = "/";
}
-#ifndef PHP_WIN32
if (snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", new_state.cwd, trailing_slash, pfx) >= MAXPATHLEN) {
efree(new_state.cwd);
return -1;