weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix address to reference array element

Browse Source 
The address of a for loop created variable does not change between loops - the variable is over-written with each new variable.  This fixes the code so that `d` references the array element instead of the local variable, which means that when `d` is assigned to `matchAll` or `specificMatch` it will work as intended.

Signed-off-by: Dobes Vandermeer <dobesv@gmail.com>
This commit is contained in:
Dobes Vandermeer 2019-05-22 14:21:18 -07:00 committed by Michael Tsang
parent 52ce959356
commit bd8cd5441a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/acmeorders/sync.go
View File

@ -476,8 +476,9 @@ func determineSolverConfigToUse(candidates []cmapi.ACMEChallengeSolver, authz *a
var matchAll *cmapi.ACMEChallengeSolver
var matchAllToSolve *acmeapi.Challenge
for _, d := range candidates {
acmech := challengeForSolver(&d)
for idx := range candidates {
d := &candidates[idx]
acmech := challengeForSolver(d)
if acmech == nil {
continue
}
@ -486,14 +487,14 @@ func determineSolverConfigToUse(candidates []cmapi.ACMEChallengeSolver, authz *a
if d.Selector == nil {
if matchAll == nil {
matchAllDomainsNumLabels = 0
matchAll = &d
matchAll = d
matchAllToSolve = acmech
}
continue
}
if len(d.Selector.DNSNames) == 0 {
if len(d.Selector.MatchLabels) > matchAllDomainsNumLabels || matchAll == nil {
matchAll = &d
matchAll = d
matchAllToSolve = acmech
}
}
@ -502,7 +503,7 @@ func determineSolverConfigToUse(candidates []cmapi.ACMEChallengeSolver, authz *a
continue
}
if len(d.Selector.MatchLabels) > numLabelsSpecificMatch || specificMatch == nil {
specificMatch = &d
specificMatch = d
specificMatchToSolve = acmech
break
}