Commit1798bb2

committed

[release-branch.go1.3] net: Don't read beyond end of slice when parsing resolv.conf options.

««« CL 102470046 / 5207b394de96net: Don't read beyond end of slice when parsing resolv.conf options.Fixes#8252.LGTM=adgR=ruiu, josharian, adgCC=golang-codereviewshttps://golang.org/cl/102470046»»»TBR=rscCC=golang-codereviewshttps://golang.org/cl/124140043

1 parent0752bc8 commit1798bb2Copy full SHA for 1798bb2

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,19 +75,19 @@ func dnsReadConfig(filename string) (*dnsConfig, error) {`
`75`	`75`	`fori:=1;i<len(f);i++ {`
`76`	`76`	`s:=f[i]`
`77`	`77`	`switch {`
`78`		`-caselen(s)>=6&&s[0:6]=="ndots:":`
	`78`	`+casehasPrefix(s,"ndots:"):`
`79`	`79`	`n,_,_:=dtoi(s,6)`
`80`	`80`	`ifn<1 {`
`81`	`81`	`n=1`
`82`	`82`	`}`
`83`	`83`	`conf.ndots=n`
`84`		`-caselen(s)>=8&&s[0:8]=="timeout:":`
	`84`	`+casehasPrefix(s,"timeout:"):`
`85`	`85`	`n,_,_:=dtoi(s,8)`
`86`	`86`	`ifn<1 {`
`87`	`87`	`n=1`
`88`	`88`	`}`
`89`	`89`	`conf.timeout=n`
`90`		`-caselen(s)>=8&&s[0:9]=="attempts:":`
	`90`	`+casehasPrefix(s,"attempts:"):`
`91`	`91`	`n,_,_:=dtoi(s,9)`
`92`	`92`	`ifn<1 {`
`93`	`93`	`n=1`
`@@ -103,3 +103,7 @@ func dnsReadConfig(filename string) (*dnsConfig, error) {`
`103`	`103`
`104`	`104`	`returnconf,nil`
`105`	`105`	`}`
	`106`	`+`
	`107`	`+funchasPrefix(s,prefixstring)bool {`
	`108`	`+returnlen(s)>=len(prefix)&&s[:len(prefix)]==prefix`
	`109`	`+}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,4 @@`
`3`	`3`	`domain Home`
`4`	`4`	`nameserver 192.168.1.1`
`5`	`5`	`options ndots:5 timeout:10 attempts:3 rotate`
	`6`	`+options attempts 3`

Comments

(0)