From 353393f9bd9c43bab74b1ba4244d82e414b0698c Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Fri, 13 Jul 2012 14:32:50 -0500
Subject: [PATCH] Fix segfault when incrementing whole vector values.

Also removed RefExpr::Eval(Val*) method since it was never called
(Clang emitted warning about this hiding overloaded virtual function
UnaryExpr::Eval(Frame*)) and doesn't appear to be necessary even if it
was called to avoid the default vector handling of UnaryExpr::Eval
(as the comment suggests as the intention).
---
 src/Expr.cc                                   |  7 ----
 src/Expr.h                                    |  4 ---
 .../btest/Baseline/language.incr-vec-expr/out |  5 +++
 testing/btest/core/leaks/incr-vec-expr.test   | 35 +++++++++++++++++++
 testing/btest/language/incr-vec-expr.test     | 27 ++++++++++++++
 5 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 testing/btest/Baseline/language.incr-vec-expr/out
 create mode 100644 testing/btest/core/leaks/incr-vec-expr.test
 create mode 100644 testing/btest/language/incr-vec-expr.test

diff --git a/src/Expr.cc b/src/Expr.cc
index 58f5db3fd1..b62f119bae 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -1035,12 +1035,10 @@ Val* IncrExpr::Eval(Frame* f) const
 				{
 				Val* new_elt = DoSingleEval(f, elt);
 				v_vec->Assign(i, new_elt, this, OP_INCR);
-				Unref(new_elt); // was Ref()'d by Assign()
 				}
 			else
 				v_vec->Assign(i, 0, this, OP_INCR);
 			}
-		// FIXME: Is the next line needed?
 		op->Assign(f, v_vec, OP_INCR);
 		}
 
@@ -2402,11 +2400,6 @@ Expr* RefExpr::MakeLvalue()
 	return this;
 	}
 
-Val* RefExpr::Eval(Val* v) const
-	{
-	return Fold(v);
-	}
-
 void RefExpr::Assign(Frame* f, Val* v, Opcode opcode)
 	{
 	op->Assign(f, v, opcode);
diff --git a/src/Expr.h b/src/Expr.h
index f0798359c2..c16cf86612 100644
--- a/src/Expr.h
+++ b/src/Expr.h
@@ -608,10 +608,6 @@ public:
 	void Assign(Frame* f, Val* v, Opcode op = OP_ASSIGN);
 	Expr* MakeLvalue();
 
-	// Only overridden to avoid special vector handling which doesn't apply
-	// for this class.
-	Val* Eval(Val* v) const;
-
 protected:
 	friend class Expr;
 	RefExpr()	{ }
diff --git a/testing/btest/Baseline/language.incr-vec-expr/out b/testing/btest/Baseline/language.incr-vec-expr/out
new file mode 100644
index 0000000000..b6c108a2d8
--- /dev/null
+++ b/testing/btest/Baseline/language.incr-vec-expr/out
@@ -0,0 +1,5 @@
+[0, 0, 0]
+[a=0, b=test, c=[1, 2, 3]]
+[1, 1, 1]
+[a=1, b=test, c=[1, 2, 3]]
+[a=1, b=test, c=[2, 3, 4]]
diff --git a/testing/btest/core/leaks/incr-vec-expr.test b/testing/btest/core/leaks/incr-vec-expr.test
new file mode 100644
index 0000000000..d2b94a5e63
--- /dev/null
+++ b/testing/btest/core/leaks/incr-vec-expr.test
@@ -0,0 +1,35 @@
+# Needs perftools support.
+#
+# @TEST-REQUIRES: bro  --help 2>&1 | grep -q mem-leaks
+#
+# @TEST-GROUP: leaks
+#
+# @TEST-EXEC: HEAP_CHECK_DUMP_DIRECTORY=. HEAPCHECK=local bro -b -m -r $TRACES/chksums/ip4-udp-good-chksum.pcap %INPUT
+
+type rec: record {
+    a: count;
+    b: string;
+    c: vector of count;
+};
+
+global vec: vector of count = vector(0,0,0);
+
+global v: rec = [$a=0, $b="test", $c=vector(1,2,3)];
+
+event new_connection(c: connection)
+    {
+    print vec;
+    print v;
+
+    ++vec;
+
+    print vec;
+
+    ++v$a;
+
+    print v;
+
+    ++v$c;
+
+    print v;
+    }
diff --git a/testing/btest/language/incr-vec-expr.test b/testing/btest/language/incr-vec-expr.test
new file mode 100644
index 0000000000..c9945061a2
--- /dev/null
+++ b/testing/btest/language/incr-vec-expr.test
@@ -0,0 +1,27 @@
+# @TEST-EXEC: bro -b %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+type rec: record {
+    a: count;
+    b: string;
+    c: vector of count;
+};
+
+global vec: vector of count = vector(0,0,0);
+
+global v: rec = [$a=0, $b="test", $c=vector(1,2,3)];
+
+print vec;
+print v;
+
+++vec;
+
+print vec;
+
+++v$a;
+
+print v;
+
+++v$c;
+
+print v;