mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 12:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2934: ASAN error when using text from the clipboard

Browse Source 
Problem:    ASAN error when using text from the clipboard.
Solution:   Get width of each character.

24951a67c2

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2025-02-09 08:19:29 +08:00
parent 9dc5e2100f
commit 9afc1f0f3b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/ops.c
View File

@@ -5246,11 +5246,16 @@ static void str_to_reg(yankreg_T *y_ptr, MotionType yank_type, const char *str,
for (const char *start = str, *end = str + len; for (const char *start = str, *end = str + len;
start < end + extraline; start < end + extraline;
start += line_len + 1, lnum++) { start += line_len + 1, lnum++) {
assert(end - start >= 0); int charlen = 0;
const char *line_end = xmemscan(start, '\n', (size_t)(end - start)); const char *line_end;
for (line_end = start; line_end < end; line_end++) {
if (*line_end == '\n') {
break;
}
charlen += utf_ptr2cells_len(line_end, (int)(end - line_end));
}
assert(line_end - start >= 0); assert(line_end - start >= 0);
line_len = (size_t)(line_end - start); line_len = (size_t)(line_end - start);
int charlen = start < end ? mb_charlen_len(start, (int)line_len) : 0;
maxlen = MAX(maxlen, (size_t)charlen); maxlen = MAX(maxlen, (size_t)charlen);
// When appending, copy the previous line and free it after. // When appending, copy the previous line and free it after.
@@ -5259,7 +5264,9 @@ static void str_to_reg(yankreg_T *y_ptr, MotionType yank_type, const char *str,
if (extra > 0) { if (extra > 0) {
memcpy(s, pp[lnum].data, extra); memcpy(s, pp[lnum].data, extra);
} }
memcpy(s + extra, start, line_len); if (line_len > 0) {
memcpy(s + extra, start, line_len);
}
size_t s_len = extra + line_len; size_t s_len = extra + line_len;
if (append) { if (append) {