updated for version 7.4.184
Problem: match() does not work properly with a {count} argument.
Solution: Compute the length once and update it. Quit the loop when at the
end. (Hirohito Higashi)
diff --git a/src/eval.c b/src/eval.c
index 65a947b..80fc337 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8014,7 +8014,7 @@
{"log10", 1, 1, f_log10},
#endif
#ifdef FEAT_LUA
- {"luaeval", 1, 2, f_luaeval},
+ {"luaeval", 1, 2, f_luaeval},
#endif
{"map", 2, 2, f_map},
{"maparg", 1, 4, f_maparg},
@@ -13905,6 +13905,7 @@
int type;
{
char_u *str = NULL;
+ long len = 0;
char_u *expr = NULL;
char_u *pat;
regmatch_T regmatch;
@@ -13944,7 +13945,10 @@
li = l->lv_first;
}
else
+ {
expr = str = get_tv_string(&argvars[0]);
+ len = (long)STRLEN(str);
+ }
pat = get_tv_string_buf_chk(&argvars[1], patbuf);
if (pat == NULL)
@@ -13968,7 +13972,7 @@
{
if (start < 0)
start = 0;
- if (start > (long)STRLEN(str))
+ if (start > len)
goto theend;
/* When "count" argument is there ignore matches before "start",
* otherwise skip part of the string. Differs when pattern is "^"
@@ -13976,7 +13980,10 @@
if (argvars[3].v_type != VAR_UNKNOWN)
startcol = start;
else
+ {
str += start;
+ len -= start;
+ }
}
if (argvars[3].v_type != VAR_UNKNOWN)
@@ -14026,6 +14033,12 @@
#else
startcol = (colnr_T)(regmatch.startp[0] + 1 - str);
#endif
+ if (startcol > (colnr_T)len
+ || str + startcol <= regmatch.startp[0])
+ {
+ match = FALSE;
+ break;
+ }
}
}