From c23555de346c53f8f6c478635c2d9e5f2992dd7f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 10 Mar 2021 19:04:07 +0100
Subject: [PATCH] patch 8.2.2585: Vim9: illegal memory access

Problem:    Vim9: illegal memory access.
Solution:   Check byte right after "null", not one more.
---
 src/version.c     | 2 ++
 src/vim9compile.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/version.c b/src/version.c
index 65a3f5019..b8ce28af8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2585,
 /**/
     2584,
 /**/
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;
-- 
2.50.1