From: Andreas Gustafsson <source@isc.org>
Date: Tue, 16 Jan 2001 17:45:27 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.1.0~20
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3f1b1020d9afb86cb0f606f56d3f63e274b50a67;p=thirdparty%2Fbind9.git

pullup:
 680.   [bug]           dns_rdata_fromstruct() mis-handles options bigger
                        than 255 octets.
---

diff --git a/CHANGES b/CHANGES
index cc682808e73..c1a971c9ba7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 680.	[bug]		dns_rdata_fromstruct() mishandled options bigger
+			than 255 octets.
+
  681.	[bug]		$GENERATE specifying output format was broken. [RT#653]
 
 	--- 9.1.0rc1 released ---
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 9b31955ca17..5569a8ced05 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: opt_41.c,v 1.19.4.1 2001/01/09 22:47:23 bwelling Exp $ */
+/* $Id: opt_41.c,v 1.19.4.2 2001/01/16 17:45:27 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
 
@@ -158,7 +158,7 @@ static inline isc_result_t
 fromstruct_opt(ARGS_FROMSTRUCT) {
 	dns_rdata_opt_t *opt = source;
 	isc_region_t region;
-	isc_uint8_t length;
+	isc_uint16_t length;
 
 	REQUIRE(type == 41);
 	REQUIRE(source != NULL);