diff options
| author | bfredl <bjorn.linse@gmail.com> | 2022-09-13 23:17:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 23:17:11 +0200 |
| commit | 1e5daed67693f88d3ad515cf9e2d2f6d29c48a08 (patch) | |
| tree | e197cd160981844600db1972f139f922eecc74d7 /src/nvim/mbyte.c | |
| parent | a8c9e721d91efe4730db78c1115261fc128dca68 (diff) | |
| parent | 25e4af439f3b5620406776ca77417d897097a3e9 (diff) | |
| download | rneovim-1e5daed67693f88d3ad515cf9e2d2f6d29c48a08.tar.gz rneovim-1e5daed67693f88d3ad515cf9e2d2f6d29c48a08.tar.bz2 rneovim-1e5daed67693f88d3ad515cf9e2d2f6d29c48a08.zip | |
Merge pull request #20164 from bfredl/luanull
fix(lua): make vim.str_utfindex and vim.str_byteindex handle NUL bytes
Diffstat (limited to 'src/nvim/mbyte.c')
| -rw-r--r-- | src/nvim/mbyte.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 1d86eb234c..72f0cec235 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -1457,7 +1457,7 @@ void mb_utflen(const char_u *s, size_t len, size_t *codepoints, size_t *codeunit { size_t count = 0, extra = 0; size_t clen; - for (size_t i = 0; i < len && s[i] != NUL; i += clen) { + for (size_t i = 0; i < len; i += clen) { clen = (size_t)utf_ptr2len_len(s + i, (int)(len - i)); // NB: gets the byte value of invalid sequence bytes. // we only care whether the char fits in the BMP or not @@ -1479,7 +1479,7 @@ ssize_t mb_utf_index_to_bytes(const char_u *s, size_t len, size_t index, bool us if (index == 0) { return 0; } - for (i = 0; i < len && s[i] != NUL; i += clen) { + for (i = 0; i < len; i += clen) { clen = (size_t)utf_ptr2len_len(s + i, (int)(len - i)); // NB: gets the byte value of invalid sequence bytes. // we only care whether the char fits in the BMP or not |