diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-28 21:31:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-28 21:31:58 +0200 |
| commit | 04fa5427b80b17f4d26f75b24668999b4c322f5b (patch) | |
| tree | 5afbfc4e6739712b0fa9f5a152d31d5637149012 /src/edit.c | |
| parent | 0e1e25fb0a95ac5be411fbf25c8e25e1008c0d3f (diff) | |
| download | vim-git-04fa5427b80b17f4d26f75b24668999b4c322f5b.tar.gz | |
updated for version 7.2.439
Problem: Invalid memory access when doing thesaurus completion and
'infercase' is set.
Solution: Use the minimal length of completed word and replacement.
(Dominique Pelle)
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/edit.c b/src/edit.c index b5c5d44a1..a6a28cc9a 100644 --- a/src/edit.c +++ b/src/edit.c @@ -2164,6 +2164,7 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags) int i, c; int actual_len; /* Take multi-byte characters */ int actual_compl_length; /* into account. */ + int min_len; int *wca; /* Wide character array. */ int has_lower = FALSE; int was_letter = FALSE; @@ -2204,6 +2205,11 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags) #endif actual_compl_length = compl_length; + /* "actual_len" may be smaller than "actual_compl_length" when using + * thesaurus, only use the minimum when comparing. */ + min_len = actual_len < actual_compl_length + ? actual_len : actual_compl_length; + /* Allocate wide character array for the completion and fill it. */ wca = (int *)alloc((unsigned)(actual_len * sizeof(int))); if (wca != NULL) @@ -2219,7 +2225,7 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags) /* Rule 1: Were any chars converted to lower? */ p = compl_orig_text; - for (i = 0; i < actual_compl_length; ++i) + for (i = 0; i < min_len; ++i) { #ifdef FEAT_MBYTE if (has_mbyte) @@ -2247,7 +2253,7 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags) if (!has_lower) { p = compl_orig_text; - for (i = 0; i < actual_compl_length; ++i) + for (i = 0; i < min_len; ++i) { #ifdef FEAT_MBYTE if (has_mbyte) @@ -2268,7 +2274,7 @@ ins_compl_add_infercase(str, len, icase, fname, dir, flags) /* Copy the original case of the part we typed. */ p = compl_orig_text; - for (i = 0; i < actual_compl_length; ++i) + for (i = 0; i < min_len; ++i) { #ifdef FEAT_MBYTE if (has_mbyte) |