diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-08-11 16:20:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-08-11 16:20:05 +0200 |
| commit | 68f46f02080b34f9e34518365df8ce9e0e4e7ac9 (patch) | |
| tree | d6164c95d9a9fcee48cca3ed6b30678fa2bd2a05 | |
| parent | efa9c7d0f68b360bbfed254f0a1adfe78d4b6e90 (diff) | |
| download | vim-68f46f02080b34f9e34518365df8ce9e0e4e7ac9.tar.gz | |
Problem: Invalid memory access in file_pat_to_reg_pat().
Solution: Use vim_isspace() instead of checking for a space only. (Dominique
Pelle)
| -rw-r--r-- | src/fileio.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index b1bcfb53..973e8ca0 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -10188,7 +10188,7 @@ file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash) #endif default: size++; -# ifdef FEAT_MBYTE +# ifdef FEAT_MBYTE if (enc_dbcs != 0 && (*mb_ptr2len)(p) > 1) { ++p; @@ -10277,7 +10277,7 @@ file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash) reg_pat[i++] = '?'; else if (*p == ',' || *p == '%' || *p == '#' - || *p == ' ' || *p == '{' || *p == '}') + || vim_isspace(*p) || *p == '{' || *p == '}') reg_pat[i++] = *p; else if (*p == '\\' && p[1] == '\\' && p[2] == '{') { diff --git a/src/version.c b/src/version.c index e5f2b948..177b5910 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 817, +/**/ 816, /**/ 815, |