thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.736

Browse Source 
Problem:    Invalid memory access.
Solution:   Avoid going over the end of a NUL terminated string. (Dominique
            Pelle)
This commit is contained in:
Bram Moolenaar
2015-06-09 20:39:24 +02:00
parent e2e4b98622
commit b878bbbca6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/regexp.c
View File

@@ -1157,7 +1157,7 @@ get_coll_element(pp)
int l = 1;
char_u *p = *pp;
if (p[1] == '.')
if (p[0] != NUL && p[1] == '.')
{
#ifdef FEAT_MBYTE
if (has_mbyte)
@@ -1228,8 +1228,9 @@ skip_anyof(p)
{
if (get_char_class(&p) == CLASS_NONE
&& get_equi_class(&p) == 0
&& get_coll_element(&p) == 0)
++p; /* It was not a class name */
&& get_coll_element(&p) == 0
&& *p != NUL)
++p; /* it is not a class name and not NUL */
}
else
++p;
@@ -3156,7 +3157,7 @@ peekchr()
/*
* META contains everything that may be magic sometimes,
* except ^ and $ ("\^" and "\$" are only magic after
* "\v"). We now fetch the next character and toggle its
* "\V"). We now fetch the next character and toggle its
* magicness. Therefore, \ is so meta-magic that it is
* not in META.
*/