Skip to content

Commit

Permalink
Add checks on data length for A and AAAA records (#919)
Browse files Browse the repository at this point in the history
* Add checks on data length for A and AAAA records

Fixes panic when parsing A or AAAA records with no data

* Add tests Field() on empty A/AAAA data

* Refactor format test

* Add return value check on format test
  • Loading branch information
No-ops authored and miekg committed Mar 12, 2019
1 parent cc8cd02 commit d49c860
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
6 changes: 6 additions & 0 deletions format.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ func Field(r RR, i int) string {
switch reflect.ValueOf(r).Elem().Type().Field(i).Tag {
case `dns:"a"`:
// TODO(miek): Hmm store this as 16 bytes
if d.Len() < net.IPv4len {
return ""
}
if d.Len() < net.IPv6len {
return net.IPv4(byte(d.Index(0).Uint()),
byte(d.Index(1).Uint()),
Expand All @@ -42,6 +45,9 @@ func Field(r RR, i int) string {
byte(d.Index(14).Uint()),
byte(d.Index(15).Uint())).String()
case `dns:"aaaa"`:
if d.Len() < net.IPv6len {
return ""
}
return net.IP{
byte(d.Index(0).Uint()),
byte(d.Index(1).Uint()),
Expand Down
16 changes: 16 additions & 0 deletions format_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package dns

import (
"testing"
)

func TestFieldEmptyAOrAAAAData(t *testing.T) {
res := Field(new(A), 1)
if res != "" {
t.Errorf("expected empty string but got %v", res)
}
res = Field(new(AAAA), 1)
if res != "" {
t.Errorf("expected empty string but got %v", res)
}
}

0 comments on commit d49c860

Please sign in to comment.