diff options
| author | vimboss <devnull@localhost> | 2008-06-29 14:16:06 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2008-06-29 14:16:06 +0000 |
| commit | 322222dfc63804c4f79d7b3b767594be2b7b3df2 (patch) | |
| tree | 15c82ecbbed213d7135add0c437c39a33e8b3805 | |
| parent | baf1ff81e37308b73de750848d69da7bb671d3b5 (diff) | |
| download | vim-322222dfc63804c4f79d7b3b767594be2b7b3df2.tar.gz | |
| -rw-r--r-- | src/mbyte.c | 19 | ||||
| -rw-r--r-- | src/message.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index 4e905936..d6edf201 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -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; } diff --git a/src/message.c b/src/message.c index 66936cda..cb749da7 100644 --- a/src/message.c +++ b/src/message.c @@ -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; } } diff --git a/src/version.c b/src/version.c index d51c8777..d44cd658 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 10, +/**/ 9, /**/ 8, |