Mercurial > vim
diff src/if_python3.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_python3.c +++ b/src/if_python3.c @@ -733,8 +733,8 @@ get_py3_exceptions(void) #endif /* DYNAMIC_PYTHON3 */ static int py3initialised = 0; - #define PYINITIALISED py3initialised +static int python_end_called = FALSE; #define DESTRUCTOR_FINISH(self) Py_TYPE(self)->tp_free((PyObject*)self) @@ -817,6 +817,7 @@ python3_end(void) if (recurse != 0) return; + python_end_called = TRUE; ++recurse; #ifdef DYNAMIC_PYTHON3 @@ -938,6 +939,9 @@ DoPyCommand(const char *cmd, rangeinitia PyObject *cmdbytes; PyGILState_STATE pygilstate; + if (python_end_called) + goto theend; + #if defined(MACOS) && !defined(MACOS_X_UNIX) GetPort(&oldPort); /* Check if the Python library is available */