From: Bram Moolenaar Date: Thu, 7 Jul 2011 15:15:33 +0000 (+0200) Subject: updated for version 7.3.242 X-Git-Tag: v7.3.242 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5ce04dd281d2923693255a1f565d2170c2ca504;p=vim updated for version 7.3.242 Problem: Illegal memory access in after_pathsep(). Solution: Check that the pointer is not at the start of the file name. (Dominique Pelle) --- diff --git a/src/misc2.c b/src/misc2.c index b7e7d01ea..dfb1fc487 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -3247,7 +3247,7 @@ get_real_state() #if defined(FEAT_MBYTE) || defined(PROTO) /* * Return TRUE if "p" points to just after a path separator. - * Take care of multi-byte characters. + * Takes care of multi-byte characters. * "b" must point to the start of the file name */ int @@ -3255,7 +3255,7 @@ after_pathsep(b, p) char_u *b; char_u *p; { - return vim_ispathsep(p[-1]) + return p > b && vim_ispathsep(p[-1]) && (!has_mbyte || (*mb_head_off)(b, p - 1) == 0); } #endif diff --git a/src/version.c b/src/version.c index d9b50a650..4826a5154 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 242, /**/ 241, /**/