From 3c0a0828945084a81fac43c5ad99736caf4cc54d Mon Sep 17 00:00:00 2001 From: Jurica Bradaric Date: Tue, 2 Feb 2016 20:07:03 +0100 Subject: [PATCH] vim-patch:7.4.816 Problem: Invalid memory access when doing ":fun X(". Solution: Check for missing ')'. (Dominique Pelle) https://github.com/vim/vim/commit/dd8a5286e191d23410c5970a0f17f01c7ff1211b --- src/nvim/eval.c | 5 ++++- src/nvim/version.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 109504037d..0d7e2f7b5d 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -19626,7 +19626,10 @@ void ex_function(exarg_T *eap) break; } } - ++p; /* skip the ')' */ + if (*p != ')') { + goto erret; + } + ++p; // skip the ')' /* find extra arguments "range", "dict" and "abort" */ for (;; ) { diff --git a/src/nvim/version.c b/src/nvim/version.c index b5a2d6d8f8..e36eb0919b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -472,7 +472,7 @@ static int included_patches[] = { // 819, // 818, // 817, - // 816, + 816, 815, 814, 813,