diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-06-25 11:34:21 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-06-25 11:39:40 -0400 |
| commit | fee4e39ca3fd8e3f5292f05f33cb9a213f318176 (patch) | |
| tree | 2b88e7a922c8c776a72e910c17901cb3dec3c889 | |
| parent | b00211a5513a546271c4b40853df50af7cceba70 (diff) | |
| download | rneovim-fee4e39ca3fd8e3f5292f05f33cb9a213f318176.tar.gz rneovim-fee4e39ca3fd8e3f5292f05f33cb9a213f318176.tar.bz2 rneovim-fee4e39ca3fd8e3f5292f05f33cb9a213f318176.zip | |
vim-patch:8.0.0706: crash when cancelling the cmdline window in Ex mode
Problem: Crash when cancelling the cmdline window in Ex mode. (James McCoy)
Solution: Do not set cmdbuff to NULL, make it empty.
https://github.com/vim/vim/commit/5a15b6aa0aa5c1559c6f1a9f06c595a8c564637d
| -rw-r--r-- | src/nvim/ex_getln.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 3372edb8fd..d152dfa271 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -6183,9 +6183,13 @@ static int open_cmdwin(void) ccline.cmdbuff = NULL; } else ccline.cmdbuff = vim_strsave(get_cursor_line_ptr()); - if (ccline.cmdbuff == NULL) + if (ccline.cmdbuff == NULL) { + ccline.cmdbuff = vim_strsave((char_u *)""); + ccline.cmdlen = 0; + ccline.cmdbufflen = 1; + ccline.cmdpos = 0; cmdwin_result = Ctrl_C; - else { + } else { ccline.cmdlen = (int)STRLEN(ccline.cmdbuff); ccline.cmdbufflen = ccline.cmdlen + 1; ccline.cmdpos = curwin->w_cursor.col; |