diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-11 15:11:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-11 15:11:57 +0200 |
| commit | 5a15b6aa0aa5c1559c6f1a9f06c595a8c564637d (patch) | |
| tree | 069509f1d0514b3d037935a00c3e313865edf266 | |
| parent | cae24be4a808d60313913cc6feea6c2bee2e2a42 (diff) | |
patch 8.0.0706: crash when cancelling the cmdline window in Ex modev8.0.0706
Problem: Crash when cancelling the cmdline window in Ex mode. (James McCoy)
Solution: Do not set cmdbuff to NULL, make it empty.
| -rw-r--r-- | src/ex_getln.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index a888ba412d..369d6c31e2 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -7042,7 +7042,13 @@ open_cmdwin(void) else ccline.cmdbuff = vim_strsave(ml_get_curline()); if (ccline.cmdbuff == NULL) + { + ccline.cmdbuff = vim_strsave((char_u *)""); + ccline.cmdlen = 0; + ccline.cmdbufflen = 1; + ccline.cmdpos = 0; cmdwin_result = Ctrl_C; + } else { ccline.cmdlen = (int)STRLEN(ccline.cmdbuff); diff --git a/src/version.c b/src/version.c index 93d26ef77c..33399a47ab 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 706, +/**/ 705, /**/ 704, |