From: Nikita Popov Date: Fri, 21 Jun 2019 13:56:02 +0000 (+0200) Subject: Fix prompt leak in phpdbg X-Git-Tag: php-7.4.0alpha2~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7bcfee9c982bd301ad720d880f35ed949c701a0;p=php Fix prompt leak in phpdbg --- diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 2d9639de46..6a684718b4 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1661,9 +1661,6 @@ phpdbg_main: phpdbg_set_color_ex(PHPDBG_COLOR_ERROR, PHPDBG_STRL("red-bold")); phpdbg_set_color_ex(PHPDBG_COLOR_NOTICE, PHPDBG_STRL("green")); - /* set default prompt */ - phpdbg_set_prompt(PHPDBG_DEFAULT_PROMPT); - if (settings > (zend_phpdbg_globals *) 0x2) { #ifdef ZTS zend_phpdbg_globals *ptr = TSRMG_BULK_STATIC(phpdbg_globals_id, zend_phpdbg_globals *); @@ -1672,6 +1669,9 @@ phpdbg_main: phpdbg_globals = *settings; #endif free(settings); + } else { + /* set default prompt */ + phpdbg_set_prompt(PHPDBG_DEFAULT_PROMPT); } /* set flags from command line */