From 8167608f047308a15ac7e42079d47fb968dfa2e1 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 14 Nov 2018 20:57:17 +0000
Subject: [PATCH] Handle lookup of undefined property in Global context Fixes
 #1978

---
 .../runtime/lib/nodes/context/index.js        | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
index 2716d2ad8..ceeb1222b 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/context/index.js
@@ -210,12 +210,26 @@ function createContext(id,seed) {
         insertSeedValues = function(keys,values) {
             if (!Array.isArray(keys)) {
                 if (values[0] === undefined) {
-                    values[0] = util.getObjectProperty(seed,keys);
+                    try {
+                        values[0] = util.getObjectProperty(seed,keys);
+                    } catch(err) {
+                        if (err.code === "INVALID_EXPR") {
+                            throw err;
+                        }
+                        value[0] = undefined;
+                    }
                 }
             } else {
                 for (var i=0;i<keys.length;i++) {
                     if (values[i] === undefined) {
-                        values[i] = util.getObjectProperty(seed,keys[i]);
+                        try {
+                            values[i] = util.getObjectProperty(seed,keys[i]);
+                        } catch(err) {
+                            if (err.code === "INVALID_EXPR") {
+                                throw err;
+                            }
+                            value[i] = undefined;
+                        }
                     }
                 }
             }
@@ -257,7 +271,12 @@ function createContext(id,seed) {
                                 return;
                             }
                             var results = Array.prototype.slice.call(arguments,[1]);
-                            insertSeedValues(key,results);
+                            try {
+                                insertSeedValues(key,results);
+                            } catch(err) {
+                                callback.apply(err);
+                                return
+                            }
                             // Put the err arg back
                             results.unshift(undefined);
                             callback.apply(null,results);
@@ -270,7 +289,14 @@ function createContext(id,seed) {
                         if (Array.isArray(key)) {
                             insertSeedValues(key,results);
                         } else if (results === undefined){
-                            results = util.getObjectProperty(seed,key);
+                            try {
+                                results = util.getObjectProperty(seed,key);
+                            } catch(err) {
+                                if (err.code === "INVALID_EXPR") {
+                                    throw err;
+                                }
+                                results = undefined;
+                            }
                         }
                     }
                     return results;