From: krakjoe Date: Sun, 2 Feb 2014 14:41:51 +0000 (+0000) Subject: ... X-Git-Tag: php-5.6.0beta2~1^2~37^2~23^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c94f8a8934211694bab200507786248185e2dfd;p=php ... --- diff --git a/phpdbg.c b/phpdbg.c index 2a10ada932..9341ad35a5 100644 --- a/phpdbg.c +++ b/phpdbg.c @@ -833,7 +833,7 @@ int main(int argc, char **argv) /* {{{ */ int step = 0; #ifdef _WIN32 - char *bp_tmp_file; + char *bp_tmp_file = NULL; #else char bp_tmp_file[] = "/tmp/phpdbg.XXXXXX"; #endif @@ -877,14 +877,23 @@ int main(int argc, char **argv) /* {{{ */ phpdbg_main: if (!cleaning) { + #ifdef _WIN32 bp_tmp_file = malloc(L_tmpnam); - tmpnam(bp_tmp_file); + if (bp_tmp_file) { + if (!tmpnam(bp_tmp_file)) { + free(bp_tmp_file); + bp_tmp_file = NULL; + } + } #else - mkstemp(bp_tmp_file); + if (!mkstemp(bp_tmp_file)) { + memset(bp_tmp_file, 0, sizeof(bp_tmp_file)); + } #endif - if (bp_tmp_file == NULL) { + + if (!bp_tmp_file) { phpdbg_error("Unable to create temporary file"); } }