Mercurial > vim
changeset 14776:09c1f241e2f7 v8.1.0400
patch 8.1.0400: using freed memory with :diffget
commit https://github.com/vim/vim/commit/d2b58c0a2c665075a8cfef57db6e1b37d4523e02
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 16 18:10:48 2018 +0200
patch 8.1.0400: using freed memory with :diffget
Problem: Using freed memory with :diffget.
Solution: Skip ex_diffupdate() while updating diffs. (closes https://github.com/vim/vim/issues/3442)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 16 Sep 2018 18:15:04 +0200 |
| parents | 33e99ee96b06 |
| children | af2860850f5e |
| files | src/diff.c src/version.c |
| diffstat | 2 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/diff.c +++ b/src/diff.c @@ -21,7 +21,8 @@ #if defined(FEAT_DIFF) || defined(PROTO) -static int diff_busy = FALSE; /* ex_diffgetput() is busy */ +static int diff_busy = FALSE; // using diff structs, don't change them +static int diff_need_update = FALSE; // ex_diffupdate needs to be called /* flags obtained from the 'diffopt' option */ #define DIFF_FILLER 0x001 // display filler lines @@ -908,6 +909,12 @@ ex_diffupdate(exarg_T *eap) // "eap" can int idx_new; diffio_T diffio; + if (diff_busy) + { + diff_need_update = TRUE; + return; + } + // Delete all diffblocks. diff_clear(curtab); curtab->tp_diff_invalid = FALSE; @@ -2660,7 +2667,7 @@ ex_diffgetput(exarg_T *eap) if (diff_buf_idx(curbuf) != idx_to) { EMSG(_("E787: Buffer changed unexpectedly")); - return; + goto theend; } } @@ -2831,7 +2838,13 @@ ex_diffgetput(exarg_T *eap) aucmd_restbuf(&aco); } +theend: diff_busy = FALSE; + if (diff_need_update) + { + diff_need_update = FALSE; + ex_diffupdate(NULL); + } /* Check that the cursor is on a valid character and update it's position. * When there were filler lines the topline has become invalid. */