Mercurial > vim
comparison src/ex_cmds2.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 | 42cd59477698 |
children | 71d7b5ed08a0 |
comparison
equal
deleted
inserted
replaced
11630:7fdc0051855a | 11631:3b53bb2a0e39 |
---|---|
1181 } | 1181 } |
1182 | 1182 |
1183 /* | 1183 /* |
1184 * Call timers that are due. | 1184 * Call timers that are due. |
1185 * Return the time in msec until the next timer is due. | 1185 * Return the time in msec until the next timer is due. |
1186 * Returns -1 if there are no pending timers. | |
1186 */ | 1187 */ |
1187 long | 1188 long |
1188 check_due_timer(void) | 1189 check_due_timer(void) |
1189 { | 1190 { |
1190 timer_T *timer; | 1191 timer_T *timer; |
1194 proftime_T now; | 1195 proftime_T now; |
1195 int did_one = FALSE; | 1196 int did_one = FALSE; |
1196 long current_id = last_timer_id; | 1197 long current_id = last_timer_id; |
1197 # ifdef WIN3264 | 1198 # ifdef WIN3264 |
1198 LARGE_INTEGER fr; | 1199 LARGE_INTEGER fr; |
1200 | |
1201 /* Don't run any timers while exiting. */ | |
1202 if (exiting) | |
1203 return next_due; | |
1199 | 1204 |
1200 QueryPerformanceFrequency(&fr); | 1205 QueryPerformanceFrequency(&fr); |
1201 # endif | 1206 # endif |
1202 profile_start(&now); | 1207 profile_start(&now); |
1203 for (timer = first_timer; timer != NULL && !got_int; timer = timer_next) | 1208 for (timer = first_timer; timer != NULL && !got_int; timer = timer_next) |