From: Francis Dupont <fdupont@isc.org>
Date: Fri, 7 Mar 2008 16:19:46 +0000 (+0000)
Subject: fix dhcpv6_relay_forw inits
X-Git-Tag: v4_1_0a2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93c769cef927c1e84fefcd60fd9859d0482b6865;p=thirdparty%2Fdhcp.git

fix dhcpv6_relay_forw inits
---

diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index 61c0df2ba..1f7a3964a 100644
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -5214,11 +5214,12 @@ dhcpv6_relay_forw(struct data_string *reply_ret, struct packet *packet) {
 	/* 
 	 * Initialize variables for early exit.
 	 */
-	memset(&enc_opt_data, 0, sizeof(enc_opt_data));
-	enc_packet = NULL;
-	memset(&enc_reply, 0, sizeof(enc_reply));
+	opt_state = NULL;
 	memset(&a_opt, 0, sizeof(a_opt));
 	memset(&packet_ero, 0, sizeof(packet_ero));
+	memset(&enc_reply, 0, sizeof(enc_reply));
+	memset(&enc_opt_data, 0, sizeof(enc_opt_data));
+	enc_packet = NULL;
 
 	/*
 	 * Get our encapsulated relay message.