Robustness against nil derefs in varnish.Controller.HasConfig().

f3aab346 · Geoff Simmons · 40ceebc2 · f3aab346
Commit f3aab346 authored May 28, 2020 by Geoff Simmons
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

varnish.go pkg/varnish/varnish.go +9 -0

No files found.
--- a/pkg/varnish/varnish.go
+++ b/pkg/varnish/varnish.go
@@ -693,12 +693,21 @@ func (vc *Controller) HasConfig(svcKey string, spec vcl.Spec,
 	if !ok {
 		return false
 	}
+	if svc == nil {
+		return false
+	}
 	if !svc.cfgLoaded {
 		return false
 	}
+	if svc.spec.ings == nil {
+		return false
+	}
 	if len(ingsMeta) != len(svc.spec.ings) {
 		return false
 	}
+	if svc.spec.bcfg == nil {
+		return false
+	}
 	if len(bcfgMeta) != len(svc.spec.bcfg) {
 		return false
 	}