From e93c638f8dd221e5c53309261fec64c6cd3eb893 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Fri, 22 Jun 2018 20:17:06 -0500
Subject: [PATCH] Fix null pointer deref in AST traversal

Specifically in the case where parsing bro scripts had failed.
---
 CHANGES         | 6 ++++++
 VERSION         | 2 +-
 src/Traverse.cc | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1789bed0cc..3cfedbf79c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.5-681 | 2018-06-22 20:17:06 -0500
+
+  * Fix null pointer deref in AST traversal (Corelight)
+
+  * Fix for ancient reference-counting bug in NFA.cc (Vern Paxson)
+
 2.5-679 | 2018-06-21 16:00:48 -0500
 
   * Add support for bitwise operations (&, |, ^, ~) on "count" values.
diff --git a/VERSION b/VERSION
index 6aaa39f82a..b1972f1dd6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-679
+2.5-681
diff --git a/src/Traverse.cc b/src/Traverse.cc
index 78eed27800..d19c6d3801 100644
--- a/src/Traverse.cc
+++ b/src/Traverse.cc
@@ -9,6 +9,10 @@ TraversalCode traverse_all(TraversalCallback* cb)
 	if ( ! global_scope() )
 		return TC_CONTINUE;
 
+	if ( ! stmts )
+		// May be null when parsing fails.
+		return TC_CONTINUE;
+
 	cb->current_scope = global_scope();
 
 	TraversalCode tc = global_scope()->Traverse(cb);