thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1150: ml_get error when using Python

Browse Source 
Problem:    ml_get error when using Python. (Yegappan Lakshmanan)
Solution:   Check the line number is not out of range.  Call "Check" with
            "fromObj" instead of "from".
This commit is contained in:
Bram Moolenaar
2020-07-07 20:12:54 +02:00
parent 007f9d6ed5
commit bb790dcc46
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/if_py_both.h
View File

@@ -3374,7 +3374,7 @@ OptionsItem(OptionsObject *self, PyObject *keyObject)
char_u *stringval;
PyObject *todecref;
if (self->Check(self->from))
if (self->Check(self->fromObj))
return NULL;
if (!(key = StringToChars(keyObject, &todecref)))
@@ -3565,7 +3565,7 @@ OptionsAssItem(OptionsObject *self, PyObject *keyObject, PyObject *valObject)
int ret = 0;
PyObject *todecref;
if (self->Check(self->from))
if (self->Check(self->fromObj))
return -1;
if (!(key = StringToChars(keyObject, &todecref)))
@@ -4334,10 +4334,15 @@ GetBufferLineList(buf_T *buf, PyInt lo, PyInt hi)
for (i = 0; i < n; ++i)
{
PyObject *string = LineToString(
(char *)ml_get_buf(buf, (linenr_T)(lo+i), FALSE));
linenr_T lnum = (linenr_T)(lo + i);
char *text;
PyObject *string;
// Error check - was the Python string creation OK?
if (lnum > buf->b_ml.ml_line_count)
text = "";
else
text = (char *)ml_get_buf(buf, lnum, FALSE);
string = LineToString(text);
if (string == NULL)
{
Py_DECREF(list);

12
src/testdir/test_python2.vim
View File

@@ -278,9 +278,9 @@ func Test_python_range()
py r[1:0] = ["d"]
call assert_equal(['c', 'd', 'a', 'two', 'three', 'b'], getline(1, '$'))
" FIXME: The following code triggers ml_get errors
" %d
" let x = pyeval('r[:]')
" The following code used to trigger an ml_get error
%d
let x = pyeval('r[:]')
" Non-existing range attribute
call AssertException(["let x = pyeval('r.abc')"],
@@ -332,9 +332,9 @@ func Test_python_window()
call AssertException(["py vim.current.window = w"],
\ 'Vim(python):vim.error: attempt to refer to deleted window')
" Try to set one of the options of the closed window
" FIXME: The following causes ASAN failure
"call AssertException(["py wopts['list'] = False"],
" \ 'vim.error: problem while switching windows')
" The following caused an ASAN failure
call AssertException(["py wopts['list'] = False"],
\ 'vim.error: attempt to refer to deleted window')
call assert_match('<window object (deleted)', pyeval("repr(w)"))
%bw!
endfunc

12
src/testdir/test_python3.vim
View File

@@ -462,9 +462,9 @@ func Test_python3_range2()
py3 r[1:0] = ["d"]
call assert_equal(['c', 'd', 'a', 'two', 'three', 'b'], getline(1, '$'))
" FIXME: The following code triggers ml_get errors
" %d
" let x = py3eval('r[:]')
" The following code used to trigger an ml_get error
%d
let x = py3eval('r[:]')
" Non-existing range attribute
call AssertException(["let x = py3eval('r.abc')"],
@@ -516,9 +516,9 @@ func Test_python3_window()
call AssertException(["py3 vim.current.window = w"],
\ 'Vim(py3):vim.error: attempt to refer to deleted window')
" Try to set one of the options of the closed window
" FIXME: The following causes ASAN failure
"call AssertException(["py3 wopts['list'] = False"],
" \ 'Vim(py3):vim.error: problem while switching windows')
" The following caused ASAN failure
call AssertException(["py3 wopts['list'] = False"],
\ 'Vim(py3):vim.error: attempt to refer to deleted window')
call assert_match('<window object (deleted)', py3eval("repr(w)"))
%bw!
endfunc

2
src/version.c
View File

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