summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-11-24 18:30:59 +0100
committerBram Moolenaar <Bram@vim.org>2016-11-24 18:30:59 +0100
commit319afe3804741db5a6c188bd69535fa7ed044c62 (patch)
tree618226b564255a38aaeb568f4bb16e38011180f5
parent73095288da839f7c738a49baa109773e76106806 (diff)
patch 8.0.0100v8.0.0100
Problem: Options that are a file name may contain non-filename characters. Solution: Check for more invalid characters.
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 2b9ba2dcfa..35563c3d50 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5880,7 +5880,7 @@ did_set_string_option(
* separator (slash and/or backslash), wildcards and characters that are
* often illegal in a file name. */
else if ((options[opt_idx].flags & P_NFNAME)
- && vim_strpbrk(*varp, (char_u *)"/\\*?[|<>") != NULL)
+ && vim_strpbrk(*varp, (char_u *)"/\\*?[|;&<>\r\n") != NULL)
{
errmsg = e_invarg;
}
diff --git a/src/version.c b/src/version.c
index 4064441c1b..5f13f76898 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 100,
+/**/
99,
/**/
98,