diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-06-28 11:32:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-06-28 11:36:27 +0800 |
| commit | de7a6b1232ac863fb604cdec361a6b7e8e94384e (patch) | |
| tree | 1cf14dacab0390f04a9fd9183002e01134488fb7 /sapi/phpdbg/phpdbg.c | |
| parent | 86732b4ea0dc0ce0a98096467eea5bb0d2eab1d1 (diff) | |
| download | php-git-de7a6b1232ac863fb604cdec361a6b7e8e94384e.tar.gz | |
MFH: Fixed fd leak (the origin commit can not be cherry-picked)
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 68a164c499..9b7993ddf0 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1439,6 +1439,7 @@ phpdbg_main: case 'i': { /* set init file */ if (init_file) { free(init_file); + init_file = NULL; } init_file_len = strlen(php_optarg); @@ -1792,7 +1793,9 @@ phpdbg_main: /* initialize from file */ PHPDBG_G(flags) |= PHPDBG_IS_INITIALIZING; zend_try { - phpdbg_init(init_file, init_file_len, init_file_default); + if (init_file) { + phpdbg_init(init_file, init_file_len, init_file_default); + } if (bp_tmp) { PHPDBG_G(flags) |= PHPDBG_DISCARD_OUTPUT; phpdbg_string_init(bp_tmp); |