From: Shawn Routhier <sar@isc.org>
Date: Tue, 23 Feb 2016 20:16:19 +0000 (-0800)
Subject: [master] Add a call to dereference the packet structure if the deocding fails
X-Git-Tag: v4_3_4~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84ee63a06b9727f9c5a8ea990668ad5b7160ee0b;p=thirdparty%2Fdhcp.git

[master] Add a call to dereference the packet structure if the deocding fails
Squashed commit of the following:

commit 7d61e40149676f989667cac90d9c3b6f5b63ac6b
Author: Shawn Routhier <sar@isc.org>
Date:   Tue Feb 23 11:31:27 2016 -0800

    [rt41774] Add a call to dereference the packet structure if the deocding fails
---

diff --git a/RELNOTES b/RELNOTES
index da7e14742..445deba9e 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -244,6 +244,10 @@ by Eric Young (eay@cryptsoft.com).
   [ISC-Bugs #37954]
   [ISC-Bugs #40752]
 
+- Add a dereference call when handling an error condition while
+  decoding a packet.
+  [ISC-Bugs #41774]
+
 			Changes since 4.3.3b1
 
 - None
diff --git a/common/options.c b/common/options.c
index 50271f220..1db73ac5a 100644
--- a/common/options.c
+++ b/common/options.c
@@ -3877,6 +3877,7 @@ void do_packet (interface, packet, len, from_port, from, hfrom)
 	/* Allocate packet->options now so it is non-null for all packets */
 	decoded_packet->options_valid = 0;
 	if (!option_state_allocate (&decoded_packet->options, MDL)) {
+		packet_dereference(&decoded_packet, MDL);
 		return;
 	}