diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-06-12 18:39:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-06-12 18:39:22 +0200 |
| commit | 8e7048ca4b699bbdb8452c0f8c642bfd66cc7bf4 (patch) | |
| tree | c53e7f1de5f3c0bb3ab1c0ef29811feb08ecf174 | |
| parent | e639eb44e9ca063f682f064095aa98fc781f5df1 (diff) | |
| download | vim-git-7.4.323.tar.gz | |
updated for version 7.4.323v7.4.323
Problem: Substitute() with zero width pattern breaks multi-byte character.
Solution: Take multi-byte character size into account. (Yukihiro Nakadaira)
| -rw-r--r-- | src/eval.c | 7 | ||||
| -rw-r--r-- | src/testdir/test69.in | 7 | ||||
| -rw-r--r-- | src/testdir/test69.ok | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 51ec0b8b9..728b7d1e2 100644 --- a/src/eval.c +++ b/src/eval.c @@ -24848,8 +24848,11 @@ do_string_sub(str, pat, sub, flags) if (zero_width == regmatch.startp[0]) { /* avoid getting stuck on a match with an empty string */ - *((char_u *)ga.ga_data + ga.ga_len) = *tail++; - ++ga.ga_len; + i = MB_PTR2LEN(tail); + mch_memmove((char_u *)ga.ga_data + ga.ga_len, tail, + (size_t)i); + ga.ga_len += i; + tail += i; continue; } zero_width = regmatch.startp[0]; diff --git a/src/testdir/test69.in b/src/testdir/test69.in index 75317b495..2510c122b 100644 --- a/src/testdir/test69.in +++ b/src/testdir/test69.in @@ -180,6 +180,13 @@ byteidx byteidxcomp STARTTEST +/^substitute +:let y = substitute('１２３', '\zs', 'a', 'g') | put =y +ENDTEST + +substitute + +STARTTEST :g/^STARTTEST/.,/^ENDTEST/d :1;/^Results/,$wq! test.out ENDTEST diff --git a/src/testdir/test69.ok b/src/testdir/test69.ok index 41cd9d02c..af8befb0c 100644 --- a/src/testdir/test69.ok +++ b/src/testdir/test69.ok @@ -160,3 +160,7 @@ byteidxcomp [0, 1, 3, 4, -1] [0, 1, 2, 4, 5, -1] + +substitute +a１a２a３a + diff --git a/src/version.c b/src/version.c index 5556ed7ee..93046ddd5 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 323, +/**/ 322, /**/ 321, |