diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-11-06 04:04:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-11-06 04:04:33 +0100 |
| commit | 4c1e626103397f8ac84ab7ca29cc74d0b3cc06e6 (patch) | |
| tree | e1235b4dcac8f377024f62b87afdbd2646706891 | |
| parent | 84dbb62fca26784eb706f5309f9285464d1a2989 (diff) | |
| download | vim-git-7.4.072.tar.gz | |
updated for version 7.4.072v7.4.072
Problem: Crash when using Insert mode completion.
Solution: Avoid going past the end of pum_array. (idea by Fransisco Lopes)
| -rw-r--r-- | src/popupmnu.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/popupmnu.c b/src/popupmnu.c index 44ed87804..8ff0711cc 100644 --- a/src/popupmnu.c +++ b/src/popupmnu.c @@ -282,6 +282,10 @@ pum_redraw() int round; int n; + /* Never display more than we have */ + if (pum_first > pum_size - pum_height) + pum_first = pum_size - pum_height; + if (pum_scrollbar) { thumb_heigth = pum_height * pum_height / pum_size; @@ -672,10 +676,6 @@ pum_set_selected(n, repeat) #endif } - /* Never display more than we have */ - if (pum_first > pum_size - pum_height) - pum_first = pum_size - pum_height; - if (!resized) pum_redraw(); diff --git a/src/version.c b/src/version.c index 69e8fbd6c..4276558b5 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 72, +/**/ 71, /**/ 70, |