From 124c985d7af91a98eb8a7aff8f66b0300849e854 Mon Sep 17 00:00:00 2001
From: Bernhard Amann <bernhard@icsi.berkeley.edu>
Date: Sun, 26 Aug 2012 14:49:37 -0700
Subject: [PATCH] Bug found bei Keith & Seth: input framework was not handling
 counts and ints out of 32-bit-range correctly.

Note - another bugfix will be coming later (problem reading sets containing zero-length-strings & un-escaping-bug in sets)
---
 src/input/readers/Ascii.cc                    |  6 +--
 .../out                                       |  3 ++
 .../base/frameworks/input/bignumber.bro       | 44 +++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 testing/btest/Baseline/scripts.base.frameworks.input.bignumber/out
 create mode 100644 testing/btest/scripts/base/frameworks/input/bignumber.bro

diff --git a/src/input/readers/Ascii.cc b/src/input/readers/Ascii.cc
index fd936b07b6..28b1ed29c9 100644
--- a/src/input/readers/Ascii.cc
+++ b/src/input/readers/Ascii.cc
@@ -238,7 +238,7 @@ Value* Ascii::EntryToVal(string s, FieldMapping field)
 		break;
 
 	case TYPE_INT:
-		val->val.int_val = atoi(s.c_str());
+		val->val.int_val = strtoll(s.c_str(), (char**) NULL, 10);
 		break;
 
 	case TYPE_DOUBLE:
@@ -249,7 +249,7 @@ Value* Ascii::EntryToVal(string s, FieldMapping field)
 
 	case TYPE_COUNT:
 	case TYPE_COUNTER:
-		val->val.uint_val = atoi(s.c_str());
+		val->val.uint_val = strtoull(s.c_str(),(char**) NULL, 10);
 		break;
 
 	case TYPE_PORT:
@@ -344,7 +344,7 @@ Value* Ascii::EntryToVal(string s, FieldMapping field)
 
 		if ( pos != length )
 			{
-			Error("Internal error while parsing set: did not find all elements");
+			Error(Fmt("Internal error while parsing set: did not find all elements: %s", s.c_str()));
 			return 0;
 			}
 
diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.bignumber/out b/testing/btest/Baseline/scripts.base.frameworks.input.bignumber/out
new file mode 100644
index 0000000000..ab095ca36c
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.frameworks.input.bignumber/out
@@ -0,0 +1,3 @@
+{
+[9223372036854775800] = [c=18446744073709551612]
+}
diff --git a/testing/btest/scripts/base/frameworks/input/bignumber.bro b/testing/btest/scripts/base/frameworks/input/bignumber.bro
new file mode 100644
index 0000000000..519992be05
--- /dev/null
+++ b/testing/btest/scripts/base/frameworks/input/bignumber.bro
@@ -0,0 +1,44 @@
+# (uses listen.bro just to ensure input sources are more reliably fully-read).
+# @TEST-SERIALIZE: comm
+#
+# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
+# @TEST-EXEC: btest-bg-wait -k 5
+# @TEST-EXEC: btest-diff out
+
+@TEST-START-FILE input.log
+#separator \x09
+#fields	i	c
+#types	int	count
+9223372036854775800	18446744073709551612
+@TEST-END-FILE
+
+@load frameworks/communication/listen
+
+global outfile: file;
+
+module A;
+
+type Idx: record {
+	i: int;
+};
+
+type Val: record {
+	c: count;
+};
+
+global servers: table[int] of Val = table();
+
+event bro_init()
+	{
+	outfile = open("../out");
+	# first read in the old stuff into the table...
+	Input::add_table([$source="../input.log", $name="ssh", $idx=Idx, $val=Val, $destination=servers]);
+	Input::remove("ssh");
+	}
+
+event Input::update_finished(name: string, source:string)
+	{
+	print outfile, servers;
+	close(outfile);
+	terminate();
+	}