From b3ff4151208b4be3b07ec2d0206da06b566d1ad4 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@illinois.edu>
Date: Fri, 3 Oct 2014 09:38:52 -0500
Subject: [PATCH] Fix uninitialized router_list argument in
 dhcp_offer/dhcp_ack.

BIT-1268 #close
---
 CHANGES                                      | 5 +++++
 VERSION                                      | 2 +-
 src/analyzer/protocol/dhcp/dhcp-analyzer.pac | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1709ec8aae..6320d72b76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.3-208 | 2014-10-03 09:38:52 -0500
+
+  * BIT-1268: Fix uninitialized router_list argument in
+    dhcp_offer/dhcp_ack. (Jon Siwek)
+
 2.3-207 | 2014-10-02 16:39:17 -0700
 
   * Updating plugin docs. (Robin Sommer)
diff --git a/VERSION b/VERSION
index cc0c518ed4..4fd3661566 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-207
+2.3-208
diff --git a/src/analyzer/protocol/dhcp/dhcp-analyzer.pac b/src/analyzer/protocol/dhcp/dhcp-analyzer.pac
index 336c8dc760..a967940ca6 100644
--- a/src/analyzer/protocol/dhcp/dhcp-analyzer.pac
+++ b/src/analyzer/protocol/dhcp/dhcp-analyzer.pac
@@ -188,6 +188,9 @@ flow DHCP_Flow(is_orig: bool) {
 		switch ( type )
 			{
 			case DHCPOFFER:
+				if ( ! router_list )
+					router_list = new TableVal(dhcp_router_list);
+
 				BifEvent::generate_dhcp_offer(connection()->bro_analyzer(),
 							      connection()->bro_analyzer()->Conn(),
 							      dhcp_msg_val_->Ref(), new AddrVal(subnet_mask),
@@ -195,6 +198,9 @@ flow DHCP_Flow(is_orig: bool) {
 				break;
 
 			case DHCPACK:
+				if ( ! router_list )
+					router_list = new TableVal(dhcp_router_list);
+
 				BifEvent::generate_dhcp_ack(connection()->bro_analyzer(),
 							    connection()->bro_analyzer()->Conn(),
 							    dhcp_msg_val_->Ref(), new AddrVal(subnet_mask),
@@ -202,12 +208,14 @@ flow DHCP_Flow(is_orig: bool) {
 				break;
 
 			case DHCPNAK:
+				Unref(router_list);
 				BifEvent::generate_dhcp_nak(connection()->bro_analyzer(),
 							    connection()->bro_analyzer()->Conn(),
 							    dhcp_msg_val_->Ref(), host_name);
 				break;
 
 			default:
+				Unref(router_list);
 				Unref(host_name);
 				break;
 			}