|
 |
c9b1f4a |
To: vim-dev@vim.org
|
|
|
c9b1f4a |
Subject: Patch 7.1.202
|
|
|
c9b1f4a |
Fcc: outbox
|
|
|
c9b1f4a |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
c9b1f4a |
Mime-Version: 1.0
|
|
|
c9b1f4a |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
c9b1f4a |
Content-Transfer-Encoding: 8bit
|
|
|
c9b1f4a |
------------
|
|
|
c9b1f4a |
|
|
|
c9b1f4a |
Patch 7.1.202
|
|
|
c9b1f4a |
Problem: Incomplete utf-8 byte sequence is not checked for validity.
|
|
|
c9b1f4a |
Solution: Check the bytes that are present for being valid. (Ben Schmidt)
|
|
|
c9b1f4a |
Files: src/mbyte.c
|
|
|
c9b1f4a |
|
|
|
c9b1f4a |
|
|
|
c9b1f4a |
*** ../vim-7.1.201/src/mbyte.c Thu Aug 30 13:51:52 2007
|
|
|
c9b1f4a |
--- src/mbyte.c Fri Jan 4 17:30:16 2008
|
|
|
c9b1f4a |
***************
|
|
|
c9b1f4a |
*** 1642,1648 ****
|
|
|
c9b1f4a |
* Get the length of UTF-8 byte sequence "p[size]". Does not include any
|
|
|
c9b1f4a |
* following composing characters.
|
|
|
c9b1f4a |
* Returns 1 for "".
|
|
|
c9b1f4a |
! * Returns 1 for an illegal byte sequence.
|
|
|
c9b1f4a |
* Returns number > "size" for an incomplete byte sequence.
|
|
|
c9b1f4a |
*/
|
|
|
c9b1f4a |
int
|
|
|
c9b1f4a |
--- 1642,1648 ----
|
|
|
c9b1f4a |
* Get the length of UTF-8 byte sequence "p[size]". Does not include any
|
|
|
c9b1f4a |
* following composing characters.
|
|
|
c9b1f4a |
* Returns 1 for "".
|
|
|
c9b1f4a |
! * Returns 1 for an illegal byte sequence (also in incomplete byte seq.).
|
|
|
c9b1f4a |
* Returns number > "size" for an incomplete byte sequence.
|
|
|
c9b1f4a |
*/
|
|
|
c9b1f4a |
int
|
|
|
c9b1f4a |
***************
|
|
|
c9b1f4a |
*** 1652,1664 ****
|
|
|
c9b1f4a |
{
|
|
|
c9b1f4a |
int len;
|
|
|
c9b1f4a |
int i;
|
|
|
c9b1f4a |
|
|
|
c9b1f4a |
if (*p == NUL)
|
|
|
c9b1f4a |
return 1;
|
|
|
c9b1f4a |
! len = utf8len_tab[*p];
|
|
|
c9b1f4a |
if (len > size)
|
|
|
c9b1f4a |
! return len; /* incomplete byte sequence. */
|
|
|
c9b1f4a |
! for (i = 1; i < len; ++i)
|
|
|
c9b1f4a |
if ((p[i] & 0xc0) != 0x80)
|
|
|
c9b1f4a |
return 1;
|
|
|
c9b1f4a |
return len;
|
|
|
c9b1f4a |
--- 1652,1665 ----
|
|
|
c9b1f4a |
{
|
|
|
c9b1f4a |
int len;
|
|
|
c9b1f4a |
int i;
|
|
|
c9b1f4a |
+ int m;
|
|
|
c9b1f4a |
|
|
|
c9b1f4a |
if (*p == NUL)
|
|
|
c9b1f4a |
return 1;
|
|
|
c9b1f4a |
! m = len = utf8len_tab[*p];
|
|
|
c9b1f4a |
if (len > size)
|
|
|
c9b1f4a |
! m = size; /* incomplete byte sequence. */
|
|
|
c9b1f4a |
! for (i = 1; i < m; ++i)
|
|
|
c9b1f4a |
if ((p[i] & 0xc0) != 0x80)
|
|
|
c9b1f4a |
return 1;
|
|
|
c9b1f4a |
return len;
|
|
|
c9b1f4a |
*** ../vim-7.1.201/src/version.c Fri Jan 4 16:30:40 2008
|
|
|
c9b1f4a |
--- src/version.c Fri Jan 4 17:45:33 2008
|
|
|
c9b1f4a |
***************
|
|
|
c9b1f4a |
*** 668,669 ****
|
|
|
c9b1f4a |
--- 668,671 ----
|
|
|
c9b1f4a |
{ /* Add new patch number below this line */
|
|
|
c9b1f4a |
+ /**/
|
|
|
c9b1f4a |
+ 202,
|
|
|
c9b1f4a |
/**/
|
|
|
c9b1f4a |
|
|
|
c9b1f4a |
--
|
|
|
c9b1f4a |
A computer programmer is a device for turning requirements into
|
|
|
c9b1f4a |
undocumented features. It runs on cola, pizza and Dilbert cartoons.
|
|
|
c9b1f4a |
Bram Moolenaar
|
|
|
c9b1f4a |
|
|
|
c9b1f4a |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
c9b1f4a |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
c9b1f4a |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
c9b1f4a |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|