diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-08-11 18:45:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-08-11 18:45:48 +0200 |
| commit | 8fee878fe277ec1b1b833ba6e5db679151f7982f (patch) | |
| tree | 8312c60b6eb8d95c1627e20702206dc32f2a54e3 | |
| parent | 901e58c243ef4363bb2c13b2c96c7b0acd45e6d1 (diff) | |
patch 7.4.820v7.4.820
Problem: Invalid memory access in file_pat_to_reg_pat.
Solution: Avoid looking before the start of a string. (Dominique Pelle)
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 973e8ca0e8..0f3f148b9b 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -10210,7 +10210,7 @@ file_pat_to_reg_pat(pat, pat_end, allow_dirs, no_bslash) else reg_pat[i++] = '^'; endp = pat_end - 1; - if (*endp == '*') + if (endp >= pat && *endp == '*') { while (endp - pat > 0 && *endp == '*') endp--; diff --git a/src/version.c b/src/version.c index e3b885ed33..f8ef512dd3 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 */ /**/ + 820, +/**/ 819, /**/ 818, |