diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-23 13:54:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-23 13:54:48 +0200 |
| commit | 73dfe917ba6357413aaf98a021c91add5ac6e9bc (patch) | |
| tree | fc64557799c316285f30090f881d385266ad3b57 | |
| parent | b2fa54a84078e2b8dc3c7c7bfbccf6b75c0788d0 (diff) | |
patch 7.4.1779v7.4.1779
Problem: Using negative index in strcharpart(). (Yegappan Lakshmanan)
Solution: Assume single byte when using a negative iindex.
| -rw-r--r-- | src/eval.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 146348dd80..a3fe2a2775 100644 --- a/src/eval.c +++ b/src/eval.c @@ -19774,7 +19774,12 @@ f_strcharpart(typval_T *argvars, typval_T *rettv) charlen = get_tv_number(&argvars[2]); while (charlen > 0 && nbyte + len < slen) { - len += mb_char2len(p[nbyte + len]); + int off = nbyte + len; + + if (off < 0) + len += 1; + else + len += mb_char2len(p[off]); --charlen; } } diff --git a/src/version.c b/src/version.c index 9aa400e8ff..adbb46a755 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1779, +/**/ 1778, /**/ 1777, |