aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.3630: printf() with %S does not handle multi-byte correctly

Browse Source 
Problem:    Printf() with %S does not handle multi-byte correctly.
Solution:   Count cells instead of bytes. (closes #9169, closes #7486)
This commit is contained in:
presuku
2021-11-20 19:38:31 +00:00
committed by Bram Moolenaar
parent a119812437
commit d85fccdfed
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/strings.c
View File

@@ -2137,14 +2137,15 @@ vim_vsnprintf_typval(
char *q = memchr(str_arg, '\0',
precision <= (size_t)0x7fffffffL ? precision
: (size_t)0x7fffffffL);
str_arg_l = (q == NULL) ? precision
: (size_t)(q - str_arg);
}
if (fmt_spec == 'S')
{
if (min_field_width != 0)
min_field_width += STRLEN(str_arg)
- mb_string2cells((char_u *)str_arg, -1);
size_t base_width = min_field_width;
size_t pad_cell = 0;
if (precision)
{
char_u *p1;
@@ -2157,8 +2158,12 @@ vim_vsnprintf_typval(
if (i > precision)
break;
}
str_arg_l = precision = p1 - (char_u *)str_arg;
pad_cell = min_field_width - precision;
base_width = str_arg_l = precision =
p1 - (char_u *)str_arg;
}
if (min_field_width != 0)
min_field_width = base_width + pad_cell;
}
break;