diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-02-02 20:13:31 +0100 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2016-02-02 20:20:23 +0100 |
| commit | 5feff1c415eb46fb6bb4680b536dfd482dfc5a95 (patch) | |
| tree | 9ced589e72b6c8630c184d7536d4a931a69aec93 | |
| parent | 3c0a0828945084a81fac43c5ad99736caf4cc54d (diff) | |
| download | rneovim-5feff1c415eb46fb6bb4680b536dfd482dfc5a95.tar.gz rneovim-5feff1c415eb46fb6bb4680b536dfd482dfc5a95.tar.bz2 rneovim-5feff1c415eb46fb6bb4680b536dfd482dfc5a95.zip | |
vim-patch:7.4.817
Problem: Invalid memory access in file_pat_to_reg_pat().
Solution: Use vim_isspace() instead of checking for a space only. (Dominique
Pelle)
https://github.com/vim/vim/commit/2288afed428d29ce2e464964df4c5a757281e70e
| -rw-r--r-- | src/nvim/fileio.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index badb5b85b0..355fddfdbb 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -7218,12 +7218,12 @@ char_u * file_pat_to_reg_pat( #ifdef BACKSLASH_IN_FILENAME && no_bslash #endif - ) + ) { reg_pat[i++] = '?'; - else if (*p == ',' || *p == '%' || *p == '#' - || *p == ' ' || *p == '{' || *p == '}') + } else if (*p == ',' || *p == '%' || *p == '#' + || ascii_isspace(*p) || *p == '{' || *p == '}') { reg_pat[i++] = *p; - else if (*p == '\\' && p[1] == '\\' && p[2] == '{') { + } else if (*p == '\\' && p[1] == '\\' && p[2] == '{') { reg_pat[i++] = '\\'; reg_pat[i++] = '{'; p += 2; diff --git a/src/nvim/version.c b/src/nvim/version.c index e36eb0919b..45a96c427b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -471,7 +471,7 @@ static int included_patches[] = { // 820, // 819, // 818, - // 817, + 817, 816, 815, 814, |