diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-09-24 00:22:58 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:01:11 +0300 |
| commit | 2dd8e05f9fa9caef6fc04882dbdd27f387112266 (patch) | |
| tree | df4542c2e585db402650ad1511d0960cb3fc5a44 /src | |
| parent | 0a44d504c86fbbf300fbff8fe82c93050c9436be (diff) | |
| download | rneovim-2dd8e05f9fa9caef6fc04882dbdd27f387112266.tar.gz rneovim-2dd8e05f9fa9caef6fc04882dbdd27f387112266.tar.bz2 rneovim-2dd8e05f9fa9caef6fc04882dbdd27f387112266.zip | |
shada: Fix jump/change list merging code
Errors happens under following conditions:
1. Jump/change list is full.
2. New jump/change list item should go between some of the old ones.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/shada.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 9e745431cb..cb5b5087f6 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -1213,10 +1213,10 @@ static inline bool marks_equal(const pos_T a, const pos_T b) if (i > 0) { \ if (jl_len == JUMPLISTSIZE) { \ free_func(jumps[0]); \ - if (i == JUMPLISTSIZE) { \ - i = JUMPLISTSIZE - 1; \ + i--; \ + if (i > 0) { \ + memmove(&jumps[0], &jumps[1], sizeof(jumps[1]) * (size_t) i); \ } \ - memmove(&jumps[0], &jumps[1], sizeof(jumps[1]) * (size_t) i); \ } else if (i != jl_len) { \ memmove(&jumps[i + 1], &jumps[i], \ sizeof(jumps[0]) * (size_t) (jl_len - i)); \ |