From fee4e39ca3fd8e3f5292f05f33cb9a213f318176 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 25 Jun 2018 11:34:21 -0400 Subject: [PATCH] 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 --- src/nvim/ex_getln.c | 8 ++++++-- 1 file 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;