summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-01-29 07:28:54 +0000
committerkrakjoe <joe.watkins@live.co.uk>2014-01-29 07:28:54 +0000
commit261a5305c6b3528ec45d6e185c50dbac61916dd6 (patch)
treedcc8ac05f4099ee2f75cbad4867cb710f3329816
parentc768abd420b92dca952ca5b39d6ea0a4395d802b (diff)
downloadphp-git-261a5305c6b3528ec45d6e185c50dbac61916dd6.tar.gz
fix bugsnet #66591 and github #60
-rw-r--r--phpdbg.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/phpdbg.c b/phpdbg.c
index e7f841c0bc..179424bf94 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -831,7 +831,13 @@ int main(int argc, char **argv) /* {{{ */
zend_bool remote = 0;
int run = 0;
int step = 0;
+
+#ifdef _WIN32
char *bp_tmp_file;
+#else
+ char bp_tmp_file[] = "/tmp/phpdbg.XXXXXX";
+#endif
+
#ifndef _WIN32
char *address;
int listen[2];
@@ -871,8 +877,12 @@ int main(int argc, char **argv) /* {{{ */
phpdbg_main:
if (!cleaning) {
+#ifdef _WIN32
bp_tmp_file = malloc(L_tmpnam);
tmpnam(bp_tmp_file);
+#else
+ mkstemp(bp_tmp_file);
+#endif
if (bp_tmp_file == NULL) {
phpdbg_error("Unable to create temporary file");
}
@@ -1342,7 +1352,11 @@ phpdbg_out:
free(sapi_name);
}
+#ifdef _WIN32
free(bp_tmp_file);
+#else
+ unlink(bp_tmp_file);
+#endif
return 0;
} /* }}} */