diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-29 23:26:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-29 23:26:37 +0100 |
| commit | a4c906a4a111cbe59cf5f1e8354a36ba83e0a444 (patch) | |
| tree | 3405689f04e8e4a0d56ac7281152001fbff94f2f | |
| parent | c593fee0e5e850f7e75be41f5d1751f28892a27f (diff) | |
patch 8.0.0271: may get ml_get error when :tcldo deletes linesv8.0.0271
Problem: May get ml_get error when :tcldo deletes lines or switches to
another buffer. (Nikolai Pavlov, closes #1421)
Solution: Check the buffer and line every time.
| -rw-r--r-- | src/Makefile | 1 | ||||
| -rw-r--r-- | src/if_tcl.c | 5 | ||||
| -rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
| -rw-r--r-- | src/testdir/test_tcl.vim | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 31 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index f26a1bf33c..922a09bfd5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2198,6 +2198,7 @@ test_arglist \ test_tabpage \ test_tagcase \ test_tagjump \ + test_tcl \ test_textobjects \ test_timers \ test_true_false \ diff --git a/src/if_tcl.c b/src/if_tcl.c index 1e856c7af4..9b47f1b045 100644 --- a/src/if_tcl.c +++ b/src/if_tcl.c @@ -1958,6 +1958,7 @@ ex_tcldo(exarg_T *eap) char var_line[VARNAME_SIZE]; linenr_T first_line = 0; linenr_T last_line = 0; + buf_T *was_curbuf = curbuf; rs = eap->line1; re = eap->line2; @@ -1979,6 +1980,8 @@ ex_tcldo(exarg_T *eap) } while (err == TCL_OK && rs <= re) { + if ((linenr_T)rs > curbuf->b_ml.ml_line_count) + break; line = (char *)ml_get_buf(curbuf, (linenr_T)rs, FALSE); if (!line) { @@ -1994,7 +1997,7 @@ ex_tcldo(exarg_T *eap) #if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5) || TCL_MAJOR_VERSION > 8 || Tcl_LimitExceeded(tclinfo.interp) #endif - ) + || curbuf != was_curbuf) break; line = (char *)Tcl_GetVar(tclinfo.interp, var_line, 0); if (line) diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index bb646ee1b0..c42aae63bd 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -193,6 +193,7 @@ NEW_TESTS = test_arglist.res \ test_substitute.res \ test_syntax.res \ test_system.res \ + test_tcl.res \ test_textobjects.res \ test_undo.res \ test_usercommands.res \ diff --git a/src/testdir/test_tcl.vim b/src/testdir/test_tcl.vim new file mode 100644 index 0000000000..ac772cc4d7 --- /dev/null +++ b/src/testdir/test_tcl.vim @@ -0,0 +1,23 @@ +" Tests for the Tcl interface. + +if !has('tcl') + finish +end + +function Test_tcldo() + " Check deleting lines does not trigger ml_get error. + new + call setline(1, ['one', 'two', 'three']) + tcldo ::vim::command %d_ + bwipe! + + " Check switching to another buffer does not trigger ml_get error. + new + let wincount = winnr('$') + call setline(1, ['one', 'two', 'three']) + tcldo ::vim::command new + call assert_equal(wincount + 1, winnr('$')) + bwipe! + bwipe! +endfunc + diff --git a/src/version.c b/src/version.c index 44e5b6fb57..9474c5ea8e 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 */ /**/ + 271, +/**/ 270, /**/ 269, |