mirror of
https://github.com/tailscale/tailscale.git
synced 2026-05-05 12:16:44 +02:00
d52ae45e9b
The cloner's codegen for map[K][]*V fields was doing a shallow append (copying pointer values) instead of cloning each element. This meant that cloned structs aliased the original's pointed-to values through the map's slice entries. Mirror the existing standalone-slice logic that checks ContainsPointers(sliceType.Elem()) and generates per-element cloning for pointer, interface, and struct types. Regenerate net/dns and tailcfg which both had affected map[...][]*dnstype.Resolver fields. Fixes #19284 Signed-off-by: Andrew Dunham <andrew@tailscale.com>
89 lines
2.2 KiB
Go
89 lines
2.2 KiB
Go
// Copyright (c) Tailscale Inc & contributors
|
|
// SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
// Code generated by tailscale.com/cmd/cloner; DO NOT EDIT.
|
|
|
|
package dns
|
|
|
|
import (
|
|
"net/netip"
|
|
|
|
"tailscale.com/types/dnstype"
|
|
"tailscale.com/util/dnsname"
|
|
"tailscale.com/util/set"
|
|
)
|
|
|
|
// Clone makes a deep copy of Config.
|
|
// The result aliases no memory with the original.
|
|
func (src *Config) Clone() *Config {
|
|
if src == nil {
|
|
return nil
|
|
}
|
|
dst := new(Config)
|
|
*dst = *src
|
|
if src.DefaultResolvers != nil {
|
|
dst.DefaultResolvers = make([]*dnstype.Resolver, len(src.DefaultResolvers))
|
|
for i := range dst.DefaultResolvers {
|
|
if src.DefaultResolvers[i] == nil {
|
|
dst.DefaultResolvers[i] = nil
|
|
} else {
|
|
dst.DefaultResolvers[i] = src.DefaultResolvers[i].Clone()
|
|
}
|
|
}
|
|
}
|
|
if dst.Routes != nil {
|
|
dst.Routes = map[dnsname.FQDN][]*dnstype.Resolver{}
|
|
for k, sv := range src.Routes {
|
|
if sv == nil {
|
|
continue
|
|
}
|
|
dst.Routes[k] = make([]*dnstype.Resolver, len(sv))
|
|
for i := range sv {
|
|
if sv[i] == nil {
|
|
dst.Routes[k][i] = nil
|
|
} else {
|
|
dst.Routes[k][i] = sv[i].Clone()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
dst.SearchDomains = append(src.SearchDomains[:0:0], src.SearchDomains...)
|
|
if dst.Hosts != nil {
|
|
dst.Hosts = map[dnsname.FQDN][]netip.Addr{}
|
|
for k := range src.Hosts {
|
|
dst.Hosts[k] = append([]netip.Addr{}, src.Hosts[k]...)
|
|
}
|
|
}
|
|
dst.SubdomainHosts = src.SubdomainHosts.Clone()
|
|
return dst
|
|
}
|
|
|
|
// A compilation failure here means this code must be regenerated, with the command at the top of this file.
|
|
var _ConfigCloneNeedsRegeneration = Config(struct {
|
|
AcceptDNS bool
|
|
DefaultResolvers []*dnstype.Resolver
|
|
Routes map[dnsname.FQDN][]*dnstype.Resolver
|
|
SearchDomains []dnsname.FQDN
|
|
Hosts map[dnsname.FQDN][]netip.Addr
|
|
SubdomainHosts set.Set[dnsname.FQDN]
|
|
OnlyIPv6 bool
|
|
}{})
|
|
|
|
// Clone duplicates src into dst and reports whether it succeeded.
|
|
// To succeed, <src, dst> must be of types <*T, *T> or <*T, **T>,
|
|
// where T is one of Config.
|
|
func Clone(dst, src any) bool {
|
|
switch src := src.(type) {
|
|
case *Config:
|
|
switch dst := dst.(type) {
|
|
case *Config:
|
|
*dst = *src.Clone()
|
|
return true
|
|
case **Config:
|
|
*dst = src.Clone()
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|