]> granicus.if.org Git - vim/commitdiff
patch 8.0.0706: crash when cancelling the cmdline window in Ex mode v8.0.0706
authorBram Moolenaar <Bram@vim.org>
Tue, 11 Jul 2017 13:11:57 +0000 (15:11 +0200)
committerBram Moolenaar <Bram@vim.org>
Tue, 11 Jul 2017 13:11:57 +0000 (15:11 +0200)
Problem:    Crash when cancelling the cmdline window in Ex mode. (James McCoy)
Solution:   Do not set cmdbuff to NULL, make it empty.

src/ex_getln.c
src/version.c

index a888ba412dfbf4dc49d85617400c8fd7c9567081..369d6c31e279feca2449f44c4aba92afeb53aafc 100644 (file)
@@ -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);
index 93d26ef77cadc969583595ce5290157c9524b4ee..33399a47ab88083356207db28af33641a9cb5bdf 100644 (file)
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    706,
 /**/
     705,
 /**/