mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- DNS: fix race in WriteDiskConfig()

This commit is contained in:
Simon Zolin 2019-12-12 15:04:29 +03:00
parent 000e842f7b
commit ef57f7e192
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dnsforward/dnsforward.go
View File

@ -86,10 +86,23 @@ func (s *Server) Close() {
s.Unlock() s.Unlock()
} }
func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2
}
// WriteDiskConfig - write configuration // WriteDiskConfig - write configuration
func (s *Server) WriteDiskConfig(c *FilteringConfig) { func (s *Server) WriteDiskConfig(c *FilteringConfig) {
s.Lock() s.Lock()
*c = s.conf.FilteringConfig sc := s.conf.FilteringConfig
*c = sc
c.RatelimitWhitelist = stringArrayDup(sc.RatelimitWhitelist)
c.BootstrapDNS = stringArrayDup(sc.BootstrapDNS)
c.AllowedClients = stringArrayDup(sc.AllowedClients)
c.DisallowedClients = stringArrayDup(sc.DisallowedClients)
c.BlockedHosts = stringArrayDup(sc.BlockedHosts)
c.UpstreamDNS = stringArrayDup(sc.UpstreamDNS)
s.Unlock() s.Unlock()
} }