]> granicus.if.org Git - php/commitdiff
fix bugsnet #66591 and github #60
authorkrakjoe <joe.watkins@live.co.uk>
Wed, 29 Jan 2014 07:28:54 +0000 (07:28 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Wed, 29 Jan 2014 07:28:54 +0000 (07:28 +0000)
phpdbg.c

index e7f841c0bcacf0f88a5f6da035aaf450794705c4..179424bf943817f951976a1e96b396d15ee1fc46 100644 (file)
--- 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;
 } /* }}} */