diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-27 23:49:00 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-27 23:49:00 -0500 |
| commit | 069a220f32577b5893218dc8b593fd09da515fb8 (patch) | |
| tree | 8c3fc6ae369f2f0d3505b14fe563b32f9c5c07fc /src/nvim/strings.c | |
| parent | 164fb2a688b8ce992acf3f9b50f154c14f670285 (diff) | |
| parent | 4d0c511354d93d963f76f44832db2c6b3dceda14 (diff) | |
| download | rneovim-069a220f32577b5893218dc8b593fd09da515fb8.tar.gz rneovim-069a220f32577b5893218dc8b593fd09da515fb8.tar.bz2 rneovim-069a220f32577b5893218dc8b593fd09da515fb8.zip | |
Merge pull request #4080 from jbradaric/vim-7.4.704
vim-patch:7.4.704
Diffstat (limited to 'src/nvim/strings.c')
| -rw-r--r-- | src/nvim/strings.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/strings.c b/src/nvim/strings.c index fe91141375..37a0fb82da 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -425,9 +425,13 @@ char_u *vim_strchr(const char_u *string, int c) const char_u *p = string; if (enc_utf8 && c >= 0x80) { while (*p != NUL) { - if (utf_ptr2char(p) == c) + int l = (*mb_ptr2len)(p); + + // Avoid matching an illegal byte here. + if (l > 1 && utf_ptr2char(p) == c) { return (char_u *) p; - p += (*mb_ptr2len)(p); + } + p += l; } return NULL; } |