summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-06-21 15:56:02 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-06-21 17:01:18 +0200
commita7bcfee9c982bd301ad720d880f35ed949c701a0 (patch)
treedaebe3e872323c4aefa3d0e8e09fb235a0ef2b77
parenteec5d2a25f75c3cacd07f8cb0f88ce3343641528 (diff)
downloadphp-git-a7bcfee9c982bd301ad720d880f35ed949c701a0.tar.gz
Fix prompt leak in phpdbg
-rw-r--r--sapi/phpdbg/phpdbg.c6
1 files changed, 3 insertions, 3 deletions
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 */