summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-03-10 19:04:07 +0100
committerBram Moolenaar <Bram@vim.org>2021-03-10 19:04:07 +0100
commitc23555de346c53f8f6c478635c2d9e5f2992dd7f (patch)
treeb60de8eed154b5e88a78e208306af6ebea026902
parentd345fb921678613ffc66a8afc82bc0e815c72312 (diff)
downloadvim-git-c23555de346c53f8f6c478635c2d9e5f2992dd7f.tar.gz
patch 8.2.2585: Vim9: illegal memory accessv8.2.2585
Problem: Vim9: illegal memory access. Solution: Check byte right after "null", not one more.
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 65a3f5019..b8ce28af8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2585,
+/**/
2584,
/**/
2583,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 7c1dca533..d29c66b66 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4184,7 +4184,7 @@ compile_expr7(
* "null" constant
*/
case 'n': if (STRNCMP(*arg, "null", 4) == 0
- && !eval_isnamec((*arg)[5]))
+ && !eval_isnamec((*arg)[4]))
{
*arg += 4;
rettv->v_type = VAR_SPECIAL;