community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix all cases of error halding (#1087) 

Automatically submitted.
This commit is contained in:
Miek Gieben 2020-03-10 07:42:28 +01:00 committed by GitHub
parent 418631f446
commit f0dca1ef05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 126 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
scan_rr.go
View File

@ -403,7 +403,7 @@ func (rr *SOA) parse(c *zlexer, o string) *ParseError {
if l.err { if l.err {
return &ParseError{"", "bad SOA zone parameter", l} return &ParseError{"", "bad SOA zone parameter", l}
} }
if j, e := strconv.ParseUint(l.token, 10, 32); e != nil { if j, err := strconv.ParseUint(l.token, 10, 32); err != nil {
if i == 0 { if i == 0 {
// Serial must be a number // Serial must be a number
return &ParseError{"", "bad SOA zone parameter", l} return &ParseError{"", "bad SOA zone parameter", l}
@ -446,16 +446,16 @@ func (rr *SRV) parse(c *zlexer, o string) *ParseError {
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
i, e = strconv.ParseUint(l.token, 10, 16) i, e1 := strconv.ParseUint(l.token, 10, 16)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad SRV Weight", l} return &ParseError{"", "bad SRV Weight", l}
} }
rr.Weight = uint16(i) rr.Weight = uint16(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
i, e = strconv.ParseUint(l.token, 10, 16) i, e2 := strconv.ParseUint(l.token, 10, 16)
if e != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad SRV Port", l} return &ParseError{"", "bad SRV Port", l}
} }
rr.Port = uint16(i) rr.Port = uint16(i)
@ -482,8 +482,8 @@ func (rr *NAPTR) parse(c *zlexer, o string) *ParseError {
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
i, e = strconv.ParseUint(l.token, 10, 16) i, e1 := strconv.ParseUint(l.token, 10, 16)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad NAPTR Preference", l} return &ParseError{"", "bad NAPTR Preference", l}
} }
rr.Preference = uint16(i) rr.Preference = uint16(i)
@ -600,15 +600,15 @@ func (rr *LOC) parse(c *zlexer, o string) *ParseError {
if rr.Latitude, ok = locCheckNorth(l.token, rr.Latitude); ok { if rr.Latitude, ok = locCheckNorth(l.token, rr.Latitude); ok {
goto East goto East
} }
i, e = strconv.ParseUint(l.token, 10, 32) if i, err := strconv.ParseUint(l.token, 10, 32); err != nil || l.err {
if e != nil || l.err {
return &ParseError{"", "bad LOC Latitude minutes", l} return &ParseError{"", "bad LOC Latitude minutes", l}
} else {
rr.Latitude += 1000 * 60 * uint32(i)
} }
rr.Latitude += 1000 * 60 * uint32(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
if i, e := strconv.ParseFloat(l.token, 32); e != nil || l.err { if i, err := strconv.ParseFloat(l.token, 32); err != nil || l.err {
return &ParseError{"", "bad LOC Latitude seconds", l} return &ParseError{"", "bad LOC Latitude seconds", l}
} else { } else {
rr.Latitude += uint32(1000 * i) rr.Latitude += uint32(1000 * i)
@ -626,7 +626,7 @@ East:
// East // East
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
if i, e := strconv.ParseUint(l.token, 10, 32); e != nil || l.err { if i, err := strconv.ParseUint(l.token, 10, 32); err != nil || l.err {
return &ParseError{"", "bad LOC Longitude", l} return &ParseError{"", "bad LOC Longitude", l}
} else { } else {
rr.Longitude = 1000 * 60 * 60 * uint32(i) rr.Longitude = 1000 * 60 * 60 * uint32(i)
@ -637,14 +637,14 @@ East:
if rr.Longitude, ok = locCheckEast(l.token, rr.Longitude); ok { if rr.Longitude, ok = locCheckEast(l.token, rr.Longitude); ok {
goto Altitude goto Altitude
} }
if i, e := strconv.ParseUint(l.token, 10, 32); e != nil || l.err { if i, err := strconv.ParseUint(l.token, 10, 32); err != nil || l.err {
return &ParseError{"", "bad LOC Longitude minutes", l} return &ParseError{"", "bad LOC Longitude minutes", l}
} else { } else {
rr.Longitude += 1000 * 60 * uint32(i) rr.Longitude += 1000 * 60 * uint32(i)
} }
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
if i, e := strconv.ParseFloat(l.token, 32); e != nil || l.err { if i, err := strconv.ParseFloat(l.token, 32); err != nil || l.err {
return &ParseError{"", "bad LOC Longitude seconds", l} return &ParseError{"", "bad LOC Longitude seconds", l}
} else { } else {
rr.Longitude += uint32(1000 * i) rr.Longitude += uint32(1000 * i)
@ -667,7 +667,7 @@ Altitude:
if l.token[len(l.token)-1] == 'M' || l.token[len(l.token)-1] == 'm' { if l.token[len(l.token)-1] == 'M' || l.token[len(l.token)-1] == 'm' {
l.token = l.token[0 : len(l.token)-1] l.token = l.token[0 : len(l.token)-1]
} }
if i, e := strconv.ParseFloat(l.token, 32); e != nil { if i, err := strconv.ParseFloat(l.token, 32); err != nil {
return &ParseError{"", "bad LOC Altitude", l} return &ParseError{"", "bad LOC Altitude", l}
} else { } else {
rr.Altitude = uint32(i*100.0 + 10000000.0 + 0.5) rr.Altitude = uint32(i*100.0 + 10000000.0 + 0.5)
@ -681,23 +681,23 @@ Altitude:
case zString: case zString:
switch count { switch count {
case 0: // Size case 0: // Size
e, m, ok := stringToCm(l.token) exp, m, ok := stringToCm(l.token)
if !ok { if !ok {
return &ParseError{"", "bad LOC Size", l} return &ParseError{"", "bad LOC Size", l}
} }
rr.Size = e&0x0f | m<<4&0xf0 rr.Size = exp&0x0f | m<<4&0xf0
case 1: // HorizPre case 1: // HorizPre
e, m, ok := stringToCm(l.token) exp, m, ok := stringToCm(l.token)
if !ok { if !ok {
return &ParseError{"", "bad LOC HorizPre", l} return &ParseError{"", "bad LOC HorizPre", l}
} }
rr.HorizPre = e&0x0f | m<<4&0xf0 rr.HorizPre = exp&0x0f | m<<4&0xf0
case 2: // VertPre case 2: // VertPre
e, m, ok := stringToCm(l.token) exp, m, ok := stringToCm(l.token)
if !ok { if !ok {
return &ParseError{"", "bad LOC VertPre", l} return &ParseError{"", "bad LOC VertPre", l}
} }
rr.VertPre = e&0x0f | m<<4&0xf0 rr.VertPre = exp&0x0f | m<<4&0xf0
} }
count++ count++
case zBlank: case zBlank:
@ -762,7 +762,7 @@ func (rr *CERT) parse(c *zlexer, o string) *ParseError {
l, _ := c.Next() l, _ := c.Next()
if v, ok := StringToCertType[l.token]; ok { if v, ok := StringToCertType[l.token]; ok {
rr.Type = v rr.Type = v
} else if i, e := strconv.ParseUint(l.token, 10, 16); e != nil { } else if i, err := strconv.ParseUint(l.token, 10, 16); err != nil {
return &ParseError{"", "bad CERT Type", l} return &ParseError{"", "bad CERT Type", l}
} else { } else {
rr.Type = uint16(i) rr.Type = uint16(i)
@ -778,7 +778,7 @@ func (rr *CERT) parse(c *zlexer, o string) *ParseError {
l, _ = c.Next() // zString l, _ = c.Next() // zString
if v, ok := StringToAlgorithm[l.token]; ok { if v, ok := StringToAlgorithm[l.token]; ok {
rr.Algorithm = v rr.Algorithm = v
} else if i, e := strconv.ParseUint(l.token, 10, 8); e != nil { } else if i, err := strconv.ParseUint(l.token, 10, 8); err != nil {
return &ParseError{"", "bad CERT Algorithm", l} return &ParseError{"", "bad CERT Algorithm", l}
} else { } else {
rr.Algorithm = uint8(i) rr.Algorithm = uint8(i)
@ -812,8 +812,8 @@ func (rr *CSYNC) parse(c *zlexer, o string) *ParseError {
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
j, e = strconv.ParseUint(l.token, 10, 16) j, e1 := strconv.ParseUint(l.token, 10, 16)
if e != nil { if e1 != nil {
// Serial must be a number // Serial must be a number
return &ParseError{"", "bad CSYNC flags", l} return &ParseError{"", "bad CSYNC flags", l}
} }
@ -845,9 +845,7 @@ func (rr *CSYNC) parse(c *zlexer, o string) *ParseError {
return nil return nil
} }
func (rr *SIG) parse(c *zlexer, o string) *ParseError { func (rr *SIG) parse(c *zlexer, o string) *ParseError { return rr.RRSIG.parse(c, o) }
return rr.RRSIG.parse(c, o)
}
func (rr *RRSIG) parse(c *zlexer, o string) *ParseError { func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
l, _ := c.Next() l, _ := c.Next()
@ -868,24 +866,24 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, err := strconv.ParseUint(l.token, 10, 8) i, e := strconv.ParseUint(l.token, 10, 8)
if err != nil || l.err { if e != nil || l.err {
return &ParseError{"", "bad RRSIG Algorithm", l} return &ParseError{"", "bad RRSIG Algorithm", l}
} }
rr.Algorithm = uint8(i) rr.Algorithm = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, err = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if err != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad RRSIG Labels", l} return &ParseError{"", "bad RRSIG Labels", l}
} }
rr.Labels = uint8(i) rr.Labels = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, err = strconv.ParseUint(l.token, 10, 32) i, e2 := strconv.ParseUint(l.token, 10, 32)
if err != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad RRSIG OrigTtl", l} return &ParseError{"", "bad RRSIG OrigTtl", l}
} }
rr.OrigTtl = uint32(i) rr.OrigTtl = uint32(i)
@ -918,8 +916,8 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, err = strconv.ParseUint(l.token, 10, 16) i, e3 := strconv.ParseUint(l.token, 10, 16)
if err != nil || l.err { if e3 != nil || l.err {
return &ParseError{"", "bad RRSIG KeyTag", l} return &ParseError{"", "bad RRSIG KeyTag", l}
} }
rr.KeyTag = uint16(i) rr.KeyTag = uint16(i)
@ -933,9 +931,9 @@ func (rr *RRSIG) parse(c *zlexer, o string) *ParseError {
} }
rr.SignerName = name rr.SignerName = name
s, e := endingToString(c, "bad RRSIG Signature") s, e4 := endingToString(c, "bad RRSIG Signature")
if e != nil { if e4 != nil {
return e return e4
} }
rr.Signature = s rr.Signature = s
@ -985,15 +983,15 @@ func (rr *NSEC3) parse(c *zlexer, o string) *ParseError {
rr.Hash = uint8(i) rr.Hash = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad NSEC3 Flags", l} return &ParseError{"", "bad NSEC3 Flags", l}
} }
rr.Flags = uint8(i) rr.Flags = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 16) i, e2 := strconv.ParseUint(l.token, 10, 16)
if e != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad NSEC3 Iterations", l} return &ParseError{"", "bad NSEC3 Iterations", l}
} }
rr.Iterations = uint16(i) rr.Iterations = uint16(i)
@ -1050,15 +1048,15 @@ func (rr *NSEC3PARAM) parse(c *zlexer, o string) *ParseError {
rr.Hash = uint8(i) rr.Hash = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad NSEC3PARAM Flags", l} return &ParseError{"", "bad NSEC3PARAM Flags", l}
} }
rr.Flags = uint8(i) rr.Flags = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 16) i, e2 := strconv.ParseUint(l.token, 10, 16)
if e != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad NSEC3PARAM Iterations", l} return &ParseError{"", "bad NSEC3PARAM Iterations", l}
} }
rr.Iterations = uint16(i) rr.Iterations = uint16(i)
@ -1132,15 +1130,15 @@ func (rr *SSHFP) parse(c *zlexer, o string) *ParseError {
rr.Algorithm = uint8(i) rr.Algorithm = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad SSHFP Type", l} return &ParseError{"", "bad SSHFP Type", l}
} }
rr.Type = uint8(i) rr.Type = uint8(i)
c.Next() // zBlank c.Next() // zBlank
s, e1 := endingToString(c, "bad SSHFP Fingerprint") s, e2 := endingToString(c, "bad SSHFP Fingerprint")
if e1 != nil { if e2 != nil {
return e1 return e2
} }
rr.FingerPrint = s rr.FingerPrint = s
return nil return nil
@ -1155,37 +1153,32 @@ func (rr *DNSKEY) parseDNSKEY(c *zlexer, o, typ string) *ParseError {
rr.Flags = uint16(i) rr.Flags = uint16(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad " + typ + " Protocol", l} return &ParseError{"", "bad " + typ + " Protocol", l}
} }
rr.Protocol = uint8(i) rr.Protocol = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
i, e = strconv.ParseUint(l.token, 10, 8) i, e2 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad " + typ + " Algorithm", l} return &ParseError{"", "bad " + typ + " Algorithm", l}
} }
rr.Algorithm = uint8(i) rr.Algorithm = uint8(i)
s, e1 := endingToString(c, "bad "+typ+" PublicKey") s, e3 := endingToString(c, "bad "+typ+" PublicKey")
if e1 != nil { if e3 != nil {
return e1 return e3
} }
rr.PublicKey = s rr.PublicKey = s
return nil return nil
} }
func (rr *DNSKEY) parse(c *zlexer, o string) *ParseError { func (rr *DNSKEY) parse(c *zlexer, o string) *ParseError { return rr.parseDNSKEY(c, o, "DNSKEY") }
return rr.parseDNSKEY(c, o, "DNSKEY") func (rr *KEY) parse(c *zlexer, o string) *ParseError { return rr.parseDNSKEY(c, o, "KEY") }
} func (rr *CDNSKEY) parse(c *zlexer, o string) *ParseError { return rr.parseDNSKEY(c, o, "CDNSKEY") }
func (rr *DS) parse(c *zlexer, o string) *ParseError { return rr.parseDS(c, o, "DS") }
func (rr *KEY) parse(c *zlexer, o string) *ParseError { func (rr *DLV) parse(c *zlexer, o string) *ParseError { return rr.parseDS(c, o, "DLV") }
return rr.parseDNSKEY(c, o, "KEY") func (rr *CDS) parse(c *zlexer, o string) *ParseError { return rr.parseDS(c, o, "CDS") }
}
func (rr *CDNSKEY) parse(c *zlexer, o string) *ParseError {
return rr.parseDNSKEY(c, o, "CDNSKEY")
}
func (rr *RKEY) parse(c *zlexer, o string) *ParseError { func (rr *RKEY) parse(c *zlexer, o string) *ParseError {
l, _ := c.Next() l, _ := c.Next()
@ -1196,21 +1189,21 @@ func (rr *RKEY) parse(c *zlexer, o string) *ParseError {
rr.Flags = uint16(i) rr.Flags = uint16(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad RKEY Protocol", l} return &ParseError{"", "bad RKEY Protocol", l}
} }
rr.Protocol = uint8(i) rr.Protocol = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
i, e = strconv.ParseUint(l.token, 10, 8) i, e2 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad RKEY Algorithm", l} return &ParseError{"", "bad RKEY Algorithm", l}
} }
rr.Algorithm = uint8(i) rr.Algorithm = uint8(i)
s, e1 := endingToString(c, "bad RKEY PublicKey") s, e3 := endingToString(c, "bad RKEY PublicKey")
if e1 != nil { if e3 != nil {
return e1 return e3
} }
rr.PublicKey = s rr.PublicKey = s
return nil return nil
@ -1243,15 +1236,15 @@ func (rr *GPOS) parse(c *zlexer, o string) *ParseError {
rr.Longitude = l.token rr.Longitude = l.token
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
_, e = strconv.ParseFloat(l.token, 64) _, e1 := strconv.ParseFloat(l.token, 64)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad GPOS Latitude", l} return &ParseError{"", "bad GPOS Latitude", l}
} }
rr.Latitude = l.token rr.Latitude = l.token
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
_, e = strconv.ParseFloat(l.token, 64) _, e2 := strconv.ParseFloat(l.token, 64)
if e != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad GPOS Altitude", l} return &ParseError{"", "bad GPOS Altitude", l}
} }
rr.Altitude = l.token rr.Altitude = l.token
@ -1267,7 +1260,7 @@ func (rr *DS) parseDS(c *zlexer, o, typ string) *ParseError {
rr.KeyTag = uint16(i) rr.KeyTag = uint16(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
if i, e = strconv.ParseUint(l.token, 10, 8); e != nil { if i, err := strconv.ParseUint(l.token, 10, 8); err != nil {
tokenUpper := strings.ToUpper(l.token) tokenUpper := strings.ToUpper(l.token)
i, ok := StringToAlgorithm[tokenUpper] i, ok := StringToAlgorithm[tokenUpper]
if !ok || l.err { if !ok || l.err {
@ -1279,31 +1272,19 @@ func (rr *DS) parseDS(c *zlexer, o, typ string) *ParseError {
} }
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad " + typ + " DigestType", l} return &ParseError{"", "bad " + typ + " DigestType", l}
} }
rr.DigestType = uint8(i) rr.DigestType = uint8(i)
s, e1 := endingToString(c, "bad "+typ+" Digest") s, e2 := endingToString(c, "bad "+typ+" Digest")
if e1 != nil { if e2 != nil {
return e1 return e2
} }
rr.Digest = s rr.Digest = s
return nil return nil
} }
func (rr *DS) parse(c *zlexer, o string) *ParseError {
return rr.parseDS(c, o, "DS")
}
func (rr *DLV) parse(c *zlexer, o string) *ParseError {
return rr.parseDS(c, o, "DLV")
}
func (rr *CDS) parse(c *zlexer, o string) *ParseError {
return rr.parseDS(c, o, "CDS")
}
func (rr *TA) parse(c *zlexer, o string) *ParseError { func (rr *TA) parse(c *zlexer, o string) *ParseError {
l, _ := c.Next() l, _ := c.Next()
i, e := strconv.ParseUint(l.token, 10, 16) i, e := strconv.ParseUint(l.token, 10, 16)
@ -1313,7 +1294,7 @@ func (rr *TA) parse(c *zlexer, o string) *ParseError {
rr.KeyTag = uint16(i) rr.KeyTag = uint16(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
if i, e := strconv.ParseUint(l.token, 10, 8); e != nil { if i, err := strconv.ParseUint(l.token, 10, 8); err != nil {
tokenUpper := strings.ToUpper(l.token) tokenUpper := strings.ToUpper(l.token)
i, ok := StringToAlgorithm[tokenUpper] i, ok := StringToAlgorithm[tokenUpper]
if !ok || l.err { if !ok || l.err {
@ -1325,14 +1306,14 @@ func (rr *TA) parse(c *zlexer, o string) *ParseError {
} }
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad TA DigestType", l} return &ParseError{"", "bad TA DigestType", l}
} }
rr.DigestType = uint8(i) rr.DigestType = uint8(i)
s, err := endingToString(c, "bad TA Digest") s, e2 := endingToString(c, "bad TA Digest")
if err != nil { if e2 != nil {
return err return e2
} }
rr.Digest = s rr.Digest = s
return nil return nil
@ -1347,22 +1328,22 @@ func (rr *TLSA) parse(c *zlexer, o string) *ParseError {
rr.Usage = uint8(i) rr.Usage = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad TLSA Selector", l} return &ParseError{"", "bad TLSA Selector", l}
} }
rr.Selector = uint8(i) rr.Selector = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e2 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad TLSA MatchingType", l} return &ParseError{"", "bad TLSA MatchingType", l}
} }
rr.MatchingType = uint8(i) rr.MatchingType = uint8(i)
// So this needs be e2 (i.e. different than e), because...??t // So this needs be e2 (i.e. different than e), because...??t
s, e2 := endingToString(c, "bad TLSA Certificate") s, e3 := endingToString(c, "bad TLSA Certificate")
if e2 != nil { if e3 != nil {
return e2 return e3
} }
rr.Certificate = s rr.Certificate = s
return nil return nil
@ -1377,22 +1358,22 @@ func (rr *SMIMEA) parse(c *zlexer, o string) *ParseError {
rr.Usage = uint8(i) rr.Usage = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad SMIMEA Selector", l} return &ParseError{"", "bad SMIMEA Selector", l}
} }
rr.Selector = uint8(i) rr.Selector = uint8(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 8) i, e2 := strconv.ParseUint(l.token, 10, 8)
if e != nil || l.err { if e2 != nil || l.err {
return &ParseError{"", "bad SMIMEA MatchingType", l} return &ParseError{"", "bad SMIMEA MatchingType", l}
} }
rr.MatchingType = uint8(i) rr.MatchingType = uint8(i)
// So this needs be e2 (i.e. different than e), because...??t // So this needs be e2 (i.e. different than e), because...??t
s, e2 := endingToString(c, "bad SMIMEA Certificate") s, e3 := endingToString(c, "bad SMIMEA Certificate")
if e2 != nil { if e3 != nil {
return e2 return e3
} }
rr.Certificate = s rr.Certificate = s
return nil return nil
@ -1469,16 +1450,16 @@ func (rr *URI) parse(c *zlexer, o string) *ParseError {
rr.Priority = uint16(i) rr.Priority = uint16(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() l, _ = c.Next()
i, e = strconv.ParseUint(l.token, 10, 16) i, e1 := strconv.ParseUint(l.token, 10, 16)
if e != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad URI Weight", l} return &ParseError{"", "bad URI Weight", l}
} }
rr.Weight = uint16(i) rr.Weight = uint16(i)
c.Next() // zBlank c.Next() // zBlank
s, err := endingToTxtSlice(c, "bad URI Target") s, e2 := endingToTxtSlice(c, "bad URI Target")
if err != nil { if e2 != nil {
return err return e2
} }
if len(s) != 1 { if len(s) != 1 {
return &ParseError{"", "bad URI Target", l} return &ParseError{"", "bad URI Target", l}
@ -1506,9 +1487,9 @@ func (rr *NID) parse(c *zlexer, o string) *ParseError {
rr.Preference = uint16(i) rr.Preference = uint16(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
u, err := stringToNodeID(l) u, e1 := stringToNodeID(l)
if err != nil || l.err { if e1 != nil || l.err {
return err return e1
} }
rr.NodeID = u rr.NodeID = u
return slurpRemainder(c) return slurpRemainder(c)
@ -1546,7 +1527,6 @@ func (rr *LP) parse(c *zlexer, o string) *ParseError {
return &ParseError{"", "bad LP Fqdn", l} return &ParseError{"", "bad LP Fqdn", l}
} }
rr.Fqdn = name rr.Fqdn = name
return slurpRemainder(c) return slurpRemainder(c)
} }
@ -1559,9 +1539,9 @@ func (rr *L64) parse(c *zlexer, o string) *ParseError {
rr.Preference = uint16(i) rr.Preference = uint16(i)
c.Next() // zBlank c.Next() // zBlank
l, _ = c.Next() // zString l, _ = c.Next() // zString
u, err := stringToNodeID(l) u, e1 := stringToNodeID(l)
if err != nil || l.err { if e1 != nil || l.err {
return err return e1
} }
rr.Locator64 = u rr.Locator64 = u
return slurpRemainder(c) return slurpRemainder(c)
@ -1624,14 +1604,13 @@ func (rr *PX) parse(c *zlexer, o string) *ParseError {
return &ParseError{"", "bad PX Mapx400", l} return &ParseError{"", "bad PX Mapx400", l}
} }
rr.Mapx400 = mapx400 rr.Mapx400 = mapx400
return slurpRemainder(c) return slurpRemainder(c)
} }
func (rr *CAA) parse(c *zlexer, o string) *ParseError { func (rr *CAA) parse(c *zlexer, o string) *ParseError {
l, _ := c.Next() l, _ := c.Next()
i, err := strconv.ParseUint(l.token, 10, 8) i, e := strconv.ParseUint(l.token, 10, 8)
if err != nil || l.err { if e != nil || l.err {
return &ParseError{"", "bad CAA Flag", l} return &ParseError{"", "bad CAA Flag", l}
} }
rr.Flag = uint8(i) rr.Flag = uint8(i)
@ -1644,9 +1623,9 @@ func (rr *CAA) parse(c *zlexer, o string) *ParseError {
rr.Tag = l.token rr.Tag = l.token
c.Next() // zBlank c.Next() // zBlank
s, e := endingToTxtSlice(c, "bad CAA Value") s, e1 := endingToTxtSlice(c, "bad CAA Value")
if e != nil { if e1 != nil {
return e return e1
} }
if len(s) != 1 { if len(s) != 1 {
return &ParseError{"", "bad CAA Value", l} return &ParseError{"", "bad CAA Value", l}
@ -1667,8 +1646,8 @@ func (rr *TKEY) parse(c *zlexer, o string) *ParseError {
// Get the key length and key values // Get the key length and key values
l, _ = c.Next() l, _ = c.Next()
i, err := strconv.ParseUint(l.token, 10, 8) i, e := strconv.ParseUint(l.token, 10, 8)
if err != nil || l.err { if e != nil || l.err {
return &ParseError{"", "bad TKEY key length", l} return &ParseError{"", "bad TKEY key length", l}
} }
rr.KeySize = uint16(i) rr.KeySize = uint16(i)
@ -1682,8 +1661,8 @@ func (rr *TKEY) parse(c *zlexer, o string) *ParseError {
// Get the otherdata length and string data // Get the otherdata length and string data
l, _ = c.Next() l, _ = c.Next()
i, err = strconv.ParseUint(l.token, 10, 8) i, e1 := strconv.ParseUint(l.token, 10, 8)
if err != nil || l.err { if e1 != nil || l.err {
return &ParseError{"", "bad TKEY otherdata length", l} return &ParseError{"", "bad TKEY otherdata length", l}
} }
rr.OtherLen = uint16(i) rr.OtherLen = uint16(i)
@ -1693,7 +1672,6 @@ func (rr *TKEY) parse(c *zlexer, o string) *ParseError {
return &ParseError{"", "bad TKEY otherday", l} return &ParseError{"", "bad TKEY otherday", l}
} }
rr.OtherData = l.token rr.OtherData = l.token
return nil return nil
} }
@ -1727,9 +1705,9 @@ func (rr *APL) parse(c *zlexer, o string) *ParseError {
family = family[1:] family = family[1:]
} }
afi, err := strconv.ParseUint(family, 10, 16) afi, e := strconv.ParseUint(family, 10, 16)
if err != nil { if e != nil {
return &ParseError{"", "failed to parse APL family: " + err.Error(), l} return &ParseError{"", "failed to parse APL family: " + e.Error(), l}
} }
var addrLen int var addrLen int
switch afi { switch afi {
@ -1741,9 +1719,9 @@ func (rr *APL) parse(c *zlexer, o string) *ParseError {
return &ParseError{"", "unrecognized APL family", l} return &ParseError{"", "unrecognized APL family", l}
} }
ip, subnet, err := net.ParseCIDR(cidr) ip, subnet, e1 := net.ParseCIDR(cidr)
if err != nil { if e1 != nil {
return &ParseError{"", "failed to parse APL address: " + err.Error(), l} return &ParseError{"", "failed to parse APL address: " + e1.Error(), l}
} }
if !ip.Equal(subnet.IP) { if !ip.Equal(subnet.IP) {
return &ParseError{"", "extra bits in APL address", l} return &ParseError{"", "extra bits in APL address", l}