aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.0.0265: may get ml_get error when :pydo deletes lines

Browse Source 
Problem:    May get ml_get error when :pydo deletes lines or switches to
            another buffer. (Nikolai Pavlov, issue #1421)
Solution:   Check the buffer and line every time.
This commit is contained in:
Bram Moolenaar
2017-01-29 21:31:09 +01:00
parent d297f35eb0
commit a58883b4ea
6 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/if_py_both.h
View File

@@ -5619,6 +5619,7 @@ run_do(const char *cmd, void *arg UNUSED
int status;
PyObject *pyfunc, *pymain;
PyObject *run_ret;
buf_T *was_curbuf = curbuf;
if (u_save((linenr_T)RangeStart - 1, (linenr_T)RangeEnd + 1) != OK)
{
@@ -5671,7 +5672,9 @@ run_do(const char *cmd, void *arg UNUSED
#ifdef PY_CAN_RECURSE
*pygilstate = PyGILState_Ensure();
#endif
if (!(line = GetBufferLine(curbuf, lnum)))
/* Check the line number, the command my have deleted lines. */
if (lnum > curbuf->b_ml.ml_line_count
|| !(line = GetBufferLine(curbuf, lnum)))
goto err;
if (!(linenr = PyInt_FromLong((long) lnum)))
{
@@ -5684,9 +5687,19 @@ run_do(const char *cmd, void *arg UNUSED
if (!ret)
goto err;
/* Check that the command didn't switch to another buffer. */
if (curbuf != was_curbuf)
{
Py_XDECREF(ret);
goto err;
}
if (ret != Py_None)
if (SetBufferLine(curbuf, lnum, ret, NULL) == FAIL)
{
Py_XDECREF(ret);
goto err;
}
Py_XDECREF(ret);
PythonIO_Flush();