aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/regexp_nfa.c
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2015-09-18 15:12:12 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2015-09-18 15:12:12 -0300
commite80d7c0df7ec6e88a964e58d86a70c8f980e4cc1 (patch)
tree0037b05c1a27aaaf31c038a32f3a64100a8f3ccf /src/nvim/regexp_nfa.c
parenta4c41735359d0114e678cbf4888c514f604f01dd (diff)
parente897ccad3eb1eb8d423766300be9c6055fcd1d9f (diff)
downloadrneovim-e80d7c0df7ec6e88a964e58d86a70c8f980e4cc1.tar.gz
rneovim-e80d7c0df7ec6e88a964e58d86a70c8f980e4cc1.tar.bz2
rneovim-e80d7c0df7ec6e88a964e58d86a70c8f980e4cc1.zip
Merge PR #3309 'Fixes for 0.1'
Diffstat (limited to 'src/nvim/regexp_nfa.c')
-rw-r--r--src/nvim/regexp_nfa.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 484dfe1e1f..4cd422400f 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -4781,6 +4781,7 @@ static long find_match_text(colnr_T startcol, int regstart, char_u *match_text)
if (match
/* check that no composing char follows */
&& !(enc_utf8
+ && STRLEN(regline) > (size_t)(col + len2)
&& utf_iscomposing(PTR2CHAR(regline + col + len2)))
) {
cleanup_subexpr();