diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-02 22:18:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-02 22:18:49 +0200 |
| commit | a5d4121eed942bbbc672a7b00bf20866c17dc858 (patch) | |
| tree | 2bf20302ef42c197e2d7e0592e8da73eb58d9f6b | |
| parent | 11fbc2866ccc11b4dd1726abdaf582a78ef3f743 (diff) | |
| download | vim-git-a5d4121eed942bbbc672a7b00bf20866c17dc858.tar.gz | |
patch 7.4.2310v7.4.2310
Problem: Accessing freed memory when a timer does not repeat.
Solution: Free after removing it. (Dominique Pelle)
| -rw-r--r-- | src/ex_cmds2.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index a76b05522..acaef9fce 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -1222,8 +1222,8 @@ check_due_timer(void) } else { - free_timer(timer); remove_timer(timer); + free_timer(timer); } /* the callback may do anything, start all over */ break; diff --git a/src/version.c b/src/version.c index 5fd33ecfa..784b405ae 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2310, +/**/ 2309, /**/ 2308, |