daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsforward/ipset: add segfault defense for missing DNS question section

Browse Source
This commit is contained in:
David Sheets
2020-10-07 09:53:30 +01:00
parent a93c6b6775
commit d39c1b0be6
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dnsforward/ipset.go
View File

@@ -131,7 +131,7 @@ func addToIpset(host string, ipsetName string, ipStr string) {
// Call addMember for each (host, ipset, ip) triple // Call addMember for each (host, ipset, ip) triple
func (c *ipsetCtx) processMembers(ctx *dnsContext, addMember func(string, string, string)) int { func (c *ipsetCtx) processMembers(ctx *dnsContext, addMember func(string, string, string)) int {
req := ctx.proxyCtx.Req req := ctx.proxyCtx.Req
if !(req.Question[0].Qtype == dns.TypeA || if req == nil || !(req.Question[0].Qtype == dns.TypeA ||
req.Question[0].Qtype == dns.TypeAAAA) || req.Question[0].Qtype == dns.TypeAAAA) ||
!ctx.responseFromUpstream { !ctx.responseFromUpstream {
return resultDone return resultDone

7
dnsforward/ipset_test.go
View File

@@ -105,6 +105,13 @@ func TestIpsetParsing(t *testing.T) {
assert.False(t, ok) assert.False(t, ok)
} }
func TestIpsetNoQuestion(t *testing.T) {
setup()
doProcess(t)
assert.Equal(t, 0, len(b))
}
func TestIpsetNoAnswer(t *testing.T) { func TestIpsetNoAnswer(t *testing.T) {
setup() setup()