From: Tarmigan Casebolt <tarmigan@gmail.com>
Date: Mon, 24 Aug 2015 02:51:31 +0000 (-0700)
Subject: net: check 'ok' return in dnsmsg when initially packing rr.Header()
X-Git-Tag: go1.6beta1~1023
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e643dc79d4d9c9d6cd680351a8d3aab5de531903;p=gostls13.git

net: check 'ok' return in dnsmsg when initially packing rr.Header()

In the present code, there is no way for ok to ever return false, but
it still a good idea to check it.

Change-Id: I8f360018b33a5d85dabbbbec0f89ffc81f77ecbb
Reviewed-on: https://go-review.googlesource.com/13956
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/net/dnsmsg.go b/src/net/dnsmsg.go
index 6ecaa94823..93078fe849 100644
--- a/src/net/dnsmsg.go
+++ b/src/net/dnsmsg.go
@@ -691,6 +691,9 @@ func packRR(rr dnsRR, msg []byte, off int) (off2 int, ok bool) {
 	// off1 is end of header
 	// off2 is end of rr
 	off1, ok = packStruct(rr.Header(), msg, off)
+	if !ok {
+		return len(msg), false
+	}
 	off2, ok = packStruct(rr, msg, off)
 	if !ok {
 		return len(msg), false