github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10046 from hashicorp/clone-panic 

Don't panic on nil UpstreamConfiguration.Clone()
pull/10048/head
Freddy 2021-04-15 15:58:16 -06:00 committed by GitHub
parent b869067b76 a0f3591aee
commit 928d3a6d30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/structs/config_entry.go
View File

@ -217,6 +217,10 @@ type UpstreamConfiguration struct {
} }
func (c *UpstreamConfiguration) Clone() *UpstreamConfiguration { func (c *UpstreamConfiguration) Clone() *UpstreamConfiguration {
if c == nil {
return nil
}
var c2 UpstreamConfiguration var c2 UpstreamConfiguration
if len(c.Overrides) > 0 { if len(c.Overrides) > 0 {
c2.Overrides = make([]*UpstreamConfig, 0, len(c.Overrides)) c2.Overrides = make([]*UpstreamConfig, 0, len(c.Overrides))