diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-01-13 08:29:54 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2024-01-13 08:31:01 +0800 |
| commit | 64a50d08c4866011be73d6af0e8ae90e06c3f949 (patch) | |
| tree | 49958ccc99d0dde40e37abaf1a8e0c4f31715112 /src | |
| parent | 2783b6b0a48389f5e12109d9894269768c3e9fe5 (diff) | |
| download | rneovim-64a50d08c4866011be73d6af0e8ae90e06c3f949.tar.gz rneovim-64a50d08c4866011be73d6af0e8ae90e06c3f949.tar.bz2 rneovim-64a50d08c4866011be73d6af0e8ae90e06c3f949.zip | |
vim-patch:9.1.0021: i_CTRL-R- doesn't work for multibyte chars in Replace mode
Problem: i_CTRL-R- doesn't work for multibyte chars in Replace mode,
Coverity complains missing return value for u_save_cursor()
Solution: Use mb_charlen() and del_chars() instead, handle failure mode
for u_save_cursor() correctly (@zeertzjq)
closes: vim/vim#13846
https://github.com/vim/vim/commit/424ec1f235a53131042aed94d30f6e2528e551d9
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 32095177be..84cba5d05c 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -1286,7 +1286,10 @@ int insert_reg(int regname, bool literally_arg) if ((State & REPLACE_FLAG) != 0) { pos_T curpos; u_save_cursor(); - del_bytes((colnr_T)strlen(reg->y_array[0]), true, false); + if (u_save_cursor() == FAIL) { + return FAIL; + } + del_chars(mb_charlen(reg->y_array[0]), true); curpos = curwin->w_cursor; if (oneright() == FAIL) { // hit end of line, need to put forward (after the current position) |