1
0
forked from aniani/vim

patch 8.0.0271: may get ml_get error when :tcldo deletes lines

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.
This commit is contained in:
Bram Moolenaar
2017-01-29 23:26:37 +01:00
parent c593fee0e5
commit a4c906a4a1
5 changed files with 31 additions and 1 deletions

View File

@@ -2198,6 +2198,7 @@ test_arglist \
test_tabpage \ test_tabpage \
test_tagcase \ test_tagcase \
test_tagjump \ test_tagjump \
test_tcl \
test_textobjects \ test_textobjects \
test_timers \ test_timers \
test_true_false \ test_true_false \

View File

@@ -1958,6 +1958,7 @@ ex_tcldo(exarg_T *eap)
char var_line[VARNAME_SIZE]; char var_line[VARNAME_SIZE];
linenr_T first_line = 0; linenr_T first_line = 0;
linenr_T last_line = 0; linenr_T last_line = 0;
buf_T *was_curbuf = curbuf;
rs = eap->line1; rs = eap->line1;
re = eap->line2; re = eap->line2;
@@ -1979,6 +1980,8 @@ ex_tcldo(exarg_T *eap)
} }
while (err == TCL_OK && rs <= re) 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); line = (char *)ml_get_buf(curbuf, (linenr_T)rs, FALSE);
if (!line) if (!line)
{ {
@@ -1994,7 +1997,7 @@ ex_tcldo(exarg_T *eap)
#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5) || TCL_MAJOR_VERSION > 8 #if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 5) || TCL_MAJOR_VERSION > 8
|| Tcl_LimitExceeded(tclinfo.interp) || Tcl_LimitExceeded(tclinfo.interp)
#endif #endif
) || curbuf != was_curbuf)
break; break;
line = (char *)Tcl_GetVar(tclinfo.interp, var_line, 0); line = (char *)Tcl_GetVar(tclinfo.interp, var_line, 0);
if (line) if (line)

View File

@@ -193,6 +193,7 @@ NEW_TESTS = test_arglist.res \
test_substitute.res \ test_substitute.res \
test_syntax.res \ test_syntax.res \
test_system.res \ test_system.res \
test_tcl.res \
test_textobjects.res \ test_textobjects.res \
test_undo.res \ test_undo.res \
test_usercommands.res \ test_usercommands.res \

23
src/testdir/test_tcl.vim Normal file
View File

@@ -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

View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
271,
/**/ /**/
270, 270,
/**/ /**/