Skip to content

Commit

Permalink
updated for version 7.3.664
Browse files Browse the repository at this point in the history
Problem:    Buffer overflow in unescaping text. (Raymond Ko)
Solution:   Limit check for multi-byte character to 4 bytes.
  • Loading branch information
brammool committed Sep 18, 2012
1 parent be1e9e9 commit 4fabd7d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/mbyte.c
Original file line number Diff line number Diff line change
Expand Up @@ -3793,13 +3793,15 @@ mb_charlen_len(str, len)
mb_unescape(pp)
char_u **pp;
{
static char_u buf[MB_MAXBYTES + 1];
int n, m = 0;
static char_u buf[6];
int n;
int m = 0;
char_u *str = *pp;

/* Must translate K_SPECIAL KS_SPECIAL KE_FILLER to K_SPECIAL and CSI
* KS_EXTRA KE_CSI to CSI. */
for (n = 0; str[n] != NUL && m <= MB_MAXBYTES; ++n)
* KS_EXTRA KE_CSI to CSI.
* Maximum length of a utf-8 character is 4 bytes. */
for (n = 0; str[n] != NUL && m < 4; ++n)
{
if (str[n] == K_SPECIAL
&& str[n + 1] == KS_SPECIAL
Expand Down Expand Up @@ -3836,6 +3838,10 @@ mb_unescape(pp)
*pp = str + n + 1;
return buf;
}

/* Bail out quickly for ASCII. */
if (buf[0] < 128)
break;
}
return NULL;
}
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
664,
/**/
663,
/**/
Expand Down

0 comments on commit 4fabd7d

Please sign in to comment.