From 105f98fbf87182c9551f24d1a913e1e4b8e6646a Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 2 Feb 2016 20:00:11 +0100
Subject: vim-patch:7.4.815

Problem:    Invalid memory access when doing ":call g:".
Solution:   Check for an empty name. (Dominique Pelle)

https://github.com/vim/vim/commit/73627d0bd43e63a67995ab1c826f1cec4ed22560
---
 src/nvim/eval.c    | 4 ++++
 src/nvim/version.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 6c471ab770..109504037d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -18578,6 +18578,9 @@ static hashtab_T *find_var_ht_dict(char_u *name, uint8_t **varname, dict_T **d)
   hashitem_T  *hi;
   *d = NULL;
 
+  if (name[0] == NUL) {
+    return NULL;
+  }
   if (name[1] != ':') {
     // name has implicit scope
     if (name[0] == ':' || name[0] == AUTOLOAD_CHAR) {
@@ -18627,6 +18630,7 @@ end:
 }
 
 // Find the hashtab used for a variable name.
+// Return NULL if the name is not valid.
 // Set "varname" to the start of name without ':'.
 static hashtab_T *find_var_ht(uint8_t *name, uint8_t **varname)
 {
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d554ec0c84..b5a2d6d8f8 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -473,7 +473,7 @@ static int included_patches[] = {
   // 818,
   // 817,
   // 816,
-  // 815,
+  815,
   814,
   813,
   // 812,
-- 
cgit