From aacd2134fac75998c51d0cbb4b3152d1fe71e94d Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 13 Sep 2019 13:09:09 -0700
Subject: [PATCH] Add check for null init variable during make_var. (Coverity
 1403419)

---
 src/Var.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Var.cc b/src/Var.cc
index 119ded1a50..35162484ed 100644
--- a/src/Var.cc
+++ b/src/Var.cc
@@ -148,8 +148,8 @@ static void make_var(ID* id, BroType* t, init_class c, Expr* init,
 			// intention clearly isn't to overwrite entire existing table val.
 			c = INIT_EXTRA;
 
-		if ( (c == INIT_EXTRA && id->FindAttr(ATTR_ADD_FUNC)) ||
-		     (c == INIT_REMOVE && id->FindAttr(ATTR_DEL_FUNC)) )
+		if ( init && ((c == INIT_EXTRA && id->FindAttr(ATTR_ADD_FUNC)) ||
+		              (c == INIT_REMOVE && id->FindAttr(ATTR_DEL_FUNC)) ))
 			// Just apply the function.
 			id->SetVal(init, c);