Permalink
Browse files

patch 8.0.0707: freeing wrong memory with certain autocommands

Problem:    Freeing wrong memory when manipulating buffers in autocommands.
            (James McCoy)
Solution:   Also set the w_s pointer if w_buffer was NULL.
  • Loading branch information...
brammool committed Jul 11, 2017
1 parent 5a15b6a commit f1d13478e3a7e1a86d52552c8c5571f00dc28ad1
Showing with 4 additions and 2 deletions.
  1. +2 −2 src/ex_cmds.c
  2. +2 −0 src/version.c
View
@@ -3968,8 +3968,8 @@ do_ecmd(
* <VN> We could instead free the synblock
* and re-attach to buffer, perhaps.
*/
if (curwin->w_buffer != NULL
&& curwin->w_s == &(curwin->w_buffer->b_s))
if (curwin->w_buffer == NULL
|| curwin->w_s == &(curwin->w_buffer->b_s))
curwin->w_s = &(buf->b_s);
#endif
curwin->w_buffer = buf;
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
707,
/**/
706,
/**/

0 comments on commit f1d1347

Please sign in to comment.