IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1779

Browse Source 
Problem:    Using negative index in strcharpart(). (Yegappan Lakshmanan)
Solution:   Assume single byte when using a negative iindex.

73dfe917ba
This commit is contained in:
Michael Ennen 2016-10-23 17:38:28 -07:00
parent b5dfdf0669
commit 6bc0d9b8c7
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/eval.c
View File

@ -15772,8 +15772,14 @@ static void f_strcharpart(typval_T *argvars, typval_T *rettv, FunPtr fptr) {
if (argvars[2].v_type != VAR_UNKNOWN) { if (argvars[2].v_type != VAR_UNKNOWN) {
charlen = get_tv_number(&argvars[2]); charlen = get_tv_number(&argvars[2]);
while (charlen > 0 && nbyte + len < slen) { while (charlen > 0 && nbyte + len < slen) {
len += mb_char2len(p[nbyte + len]); int off = nbyte + len;
charlen--;
if (off < 0) {
len += 1;
} else {
len += mb_char2len(p[off]);
charlen--;
}
} }
} else { } else {
len = slen - nbyte; // default: all bytes that are available. len = slen - nbyte; // default: all bytes that are available.

26
src/nvim/testdir/test_expr_utf8.vim
View File

@ -4,29 +4,35 @@ if !has('multi_byte')
endif endif
scriptencoding utf-8 scriptencoding utf-8
func Test_strgetchar() func Test_strgetchar_utf8()
call assert_equal(char2nr('á'), strgetchar('áxb', 0)) call assert_equal(char2nr('á'), strgetchar('áxb', 0))
call assert_equal(char2nr('x'), strgetchar('áxb', 1)) call assert_equal(char2nr('x'), strgetchar('áxb', 1))
call assert_equal(-1, strgetchar('axb', -1)) call assert_equal(char2nr('a'), strgetchar('àxb', 0))
call assert_equal(-1, strgetchar('axb', 3))
call assert_equal(-1, strgetchar('', 0))
call assert_equal(char2nr('a'), strgetchar('àxb', 0))
call assert_equal(char2nr('̀'), strgetchar('àxb', 1)) call assert_equal(char2nr('̀'), strgetchar('àxb', 1))
call assert_equal(char2nr('x'), strgetchar('àxb', 2)) call assert_equal(char2nr('x'), strgetchar('àxb', 2))
call assert_equal(char2nr('あ'), strgetchar('あaい', 0)) call assert_equal(char2nr('あ'), strgetchar('あaい', 0))
call assert_equal(char2nr('a'), strgetchar('あaい', 1)) call assert_equal(char2nr('a'), strgetchar('あaい', 1))
call assert_equal(char2nr('い'), strgetchar('あaい', 2)) call assert_equal(char2nr('い'), strgetchar('あaい', 2))
endfunc endfunc
func Test_strcharpart() func Test_strcharpart_utf8()
call assert_equal('áxb', strcharpart('áxb', 0)) call assert_equal('áxb', strcharpart('áxb', 0))
call assert_equal('á', strcharpart('áxb', 0, 1)) call assert_equal('á', strcharpart('áxb', 0, 1))
call assert_equal('x', strcharpart('áxb', 1, 1)) call assert_equal('x', strcharpart('áxb', 1, 1))
call assert_equal('a', strcharpart('àxb', 0, 1)) call assert_equal('いうeお', strcharpart('あいうeお', 1))
call assert_equal('い', strcharpart('あいうeお', 1, 1))
call assert_equal('いう', strcharpart('あいうeお', 1, 2))
call assert_equal('いうe', strcharpart('あいうeお', 1, 3))
call assert_equal('いうeお', strcharpart('あいうeお', 1, 4))
call assert_equal('eお', strcharpart('あいうeお', 3))
call assert_equal('e', strcharpart('あいうeお', 3, 1))
call assert_equal('あ', strcharpart('あいうeお', -3, 4))
call assert_equal('a', strcharpart('àxb', 0, 1))
call assert_equal('̀', strcharpart('àxb', 1, 1)) call assert_equal('̀', strcharpart('àxb', 1, 1))
call assert_equal('x', strcharpart('àxb', 2, 1)) call assert_equal('x', strcharpart('àxb', 2, 1))
endfunc endfunc

2
src/nvim/version.c
View File

@ -663,7 +663,7 @@ static int included_patches[] = {
// 1782, // 1782,
// 1781, // 1781,
// 1780, // 1780,
// 1779, 1779,
// 1778 NA // 1778 NA
// 1777 NA // 1777 NA
// 1776 NA // 1776 NA