diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-02-17 15:45:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-02-17 15:45:37 +0100 |
| commit | 6d47df7ca0fd1dd649e050fd3bddbf8b3dbe266d (patch) | |
| tree | cc341d3b0175c441a8ccf31ef81f5bb7c21d4a37 | |
| parent | 5004e8846e3e7ab3888b57746c4d84719c70ccf4 (diff) | |
| download | vim-git-7.3.822.tar.gz | |
updated for version 7.3.822v7.3.822
Problem: Crash when accessing freed buffer.
Solution: Get 'textwidth' in caller of enter_buffer(). (Christian Brabandt)
| -rw-r--r-- | src/buffer.c | 34 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 29 insertions, 7 deletions
diff --git a/src/buffer.c b/src/buffer.c index cfe408093..1f460b90f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -82,6 +82,9 @@ open_buffer(read_stdin, eap, flags) #ifdef FEAT_AUTOCMD buf_T *old_curbuf; #endif +#ifdef FEAT_SYN_HL + long old_tw = curbuf->b_p_tw; +#endif /* * The 'readonly' flag is only set when BF_NEVERLOADED is being reset. @@ -113,6 +116,10 @@ open_buffer(read_stdin, eap, flags) } EMSG(_("E83: Cannot allocate buffer, using other one...")); enter_buffer(curbuf); +#ifdef FEAT_SYN_HL + if (old_tw != curbuf->b_p_tw) + check_colorcolumn(curwin); +#endif return FAIL; } @@ -786,6 +793,9 @@ handle_swap_exists(old_curbuf) # if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) cleanup_T cs; # endif +#ifdef FEAT_SYN_HL + long old_tw = curbuf->b_p_tw; +#endif if (swap_exists_action == SEA_QUIT) { @@ -804,7 +814,13 @@ handle_swap_exists(old_curbuf) if (!buf_valid(old_curbuf) || old_curbuf == curbuf) old_curbuf = buflist_new(NULL, NULL, 1L, BLN_CURBUF | BLN_LISTED); if (old_curbuf != NULL) + { enter_buffer(old_curbuf); +#ifdef FEAT_SYN_HL + if (old_tw != curbuf->b_p_tw) + check_colorcolumn(curwin); +#endif + } /* If "old_curbuf" is NULL we are in big trouble here... */ # if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) @@ -1364,6 +1380,9 @@ set_curbuf(buf, action) buf_T *prevbuf; int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL || action == DOBUF_WIPE); +#ifdef FEAT_SYN_HL + long old_tw = curbuf->b_p_tw; +#endif setpcmark(); if (!cmdmod.keepalt) @@ -1430,21 +1449,24 @@ set_curbuf(buf, action) # endif ) #endif + { enter_buffer(buf); +#ifdef FEAT_SYN_HL + if (old_tw != curbuf->b_p_tw) + check_colorcolumn(curwin); +#endif + } } /* * Enter a new current buffer. - * Old curbuf must have been abandoned already! + * Old curbuf must have been abandoned already! This also means "curbuf" may + * be pointing to freed memory. */ void enter_buffer(buf) buf_T *buf; { -#ifdef FEAT_SYN_HL - long old_tw = curbuf->b_p_tw; -#endif - /* Copy buffer and window local option values. Not for a help buffer. */ buf_copy_options(buf, BCO_ENTER | BCO_NOHELP); if (!buf->b_help) @@ -1468,8 +1490,6 @@ enter_buffer(buf) #ifdef FEAT_SYN_HL curwin->w_s = &(buf->b_s); - if (old_tw != buf->b_p_tw) - check_colorcolumn(curwin); #endif /* Cursor on first line by default. */ diff --git a/src/version.c b/src/version.c index c8381a1ae..347d1b780 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 822, +/**/ 821, /**/ 820, |