aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.2a-010

Browse Source
This commit is contained in:
Bram Moolenaar
2008-06-29 14:16:06 +00:00
parent 0d1498ea69
commit 89bf0927af
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mbyte.c
View File

@@ -1387,7 +1387,7 @@ utf_ptr2char(p)
return p[0];
len = utf8len_tab[p[0]];
if ((p[1] & 0xc0) == 0x80)
if (len > 1 && (p[1] & 0xc0) == 0x80)
{
if (len == 2)
return ((p[0] & 0x1f) << 6) + (p[1] & 0x3f);
@@ -1753,14 +1753,27 @@ utfc_ptr2len_len(p, size)
#endif
while (len < size)
{
if (p[len] < 0x80 || !UTF_COMPOSINGLIKE(p + prevlen, p + len))
int len_next_char;
if (p[len] < 0x80)
break;
/*
* Next character length should not go beyond size to ensure that
* UTF_COMPOSINGLIKE(...) does not read beyond size.
*/
len_next_char = utf_ptr2len_len(p + len, size - len);
if (len_next_char > size - len)
break;
if (!UTF_COMPOSINGLIKE(p + prevlen, p + len))
break;
/* Skip over composing char */
#ifdef FEAT_ARABIC
prevlen = len;
#endif
len += utf_ptr2len_len(p + len, size - len);
len += len_next_char;
}
return len;
}

2
src/message.c
View File

@@ -1391,7 +1391,7 @@ msg_outtrans_len_attr(msgstr, len, attr)
plain_start = str + 1;
msg_puts_attr(s, attr == 0 ? hl_attr(HLF_8) : attr);
}
retval += ptr2cells(str);
retval += char2cells(*str);
++str;
}
}

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
10,
/**/
9,
/**/