summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-08-11 15:54:52 +0200
committerBram Moolenaar <Bram@vim.org>2015-08-11 15:54:52 +0200
commitdd8a5286e191d23410c5970a0f17f01c7ff1211b (patch)
treec0ac60a4bef3fbc1d9c69fabc23a80a7b41707bf /src
parent73627d0bd43e63a67995ab1c826f1cec4ed22560 (diff)
downloadvim-dd8a5286e191d23410c5970a0f17f01c7ff1211b.zip
patch 7.4.816
Problem: Invalid memory access when doing ":fun X(". Solution: Check for missing ')'. (Dominique Pelle)
Diffstat (limited to 'src')
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index cc9e87881..9de276415 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -22557,6 +22557,8 @@ ex_function(eap)
break;
}
}
+ if (*p != ')')
+ goto erret;
++p; /* skip the ')' */
/* find extra arguments "range", "dict" and "abort" */
diff --git a/src/version.c b/src/version.c
index fc27f4146..e5f2b9482 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 */
/**/
+ 816,
+/**/
815,
/**/
814,