]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://github.com/krakjoe/phpdbg
authorkrakjoe <joe.watkins@live.co.uk>
Mon, 25 Nov 2013 23:03:52 +0000 (23:03 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Mon, 25 Nov 2013 23:03:52 +0000 (23:03 +0000)
1  2 
phpdbg.c

diff --cc phpdbg.c
index 9eb1a0b32e56744344759d352d3b82afe11b6c60,275d91a795bb3812ea65298e789c27df4575c343..3ad12968b114d613e0febdac06bcd7d9686d0ff9
+++ b/phpdbg.c
@@@ -570,7 -573,14 +571,14 @@@ int main(int argc, char **argv) /* {{{ 
        tsrm_ls = ts_resource(0);
  #endif
  
 -
 +phpdbg_main:
+       if (!cleaning) {
+               bp_tmp_file = malloc(L_tmpnam);
+               tmpnam(bp_tmp_file);
+               if (bp_tmp_file == NULL) {
+                       phpdbg_error("Unable to create temporary file");
+               }
+       }
        ini_entries = NULL;
        ini_entries_len = 0;
        ini_ignore = 0;
@@@ -851,10 -869,7 +863,12 @@@ phpdbg_out
                goto phpdbg_main;
        }
  
 +#ifdef ZTS
 +      /* bugggy */
 +      /* tsrm_shutdown(); */
 +#endif
++      
+       free(bp_tmp_file);
  
        return 0;
  } /* }}} */