Mercurial > vim
diff src/if_python.c @ 11631:3b53bb2a0e39 v8.0.0698
patch 8.0.0698: crash on exit when using Python function in timer.
commit https://github.com/vim/vim/commit/c4f833808af930505017c9389d44a828601e247c
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jul 7 14:50:44 2017 +0200
patch 8.0.0698: crash on exit when using Python function in timer.
Problem: When a timer uses ":pyeval" or another Python command and it
happens to be triggered while exiting a Crash may happen.
(Ricky Zhou)
Solution: Avoid running a Python command after python_end() was called.
Do not trigger timers while exiting. (closes #1824)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 07 Jul 2017 15:00:03 +0200 |
| parents | 7598ce51bf2a |
| children | 68d7bc045dbe |
line wrap: on
line diff
--- a/src/if_python.c +++ b/src/if_python.c @@ -779,6 +779,7 @@ get_exceptions(void) static int initialised = 0; #define PYINITIALISED initialised +static int python_end_called = FALSE; #define DESTRUCTOR_FINISH(self) self->ob_type->tp_free((PyObject*)self); @@ -878,6 +879,7 @@ python_end(void) if (recurse != 0) return; + python_end_called = TRUE; ++recurse; #ifdef DYNAMIC_PYTHON @@ -1040,6 +1042,8 @@ DoPyCommand(const char *cmd, rangeinitia } ++recursive; #endif + if (python_end_called) + return; #if defined(MACOS) && !defined(MACOS_X_UNIX) GetPort(&oldPort); @@ -1568,7 +1572,7 @@ do_pyeval (char_u *str, typval_T *rettv) (rangeinitializer) init_range_eval, (runner) run_eval, (void *) rettv); - switch(rettv->v_type) + switch (rettv->v_type) { case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break; case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break;