Subtle pointer checks (#1433)

trimble-oss · Jan 16, 2025 · fab19fe · fab19fe
1 parent 233fd91
commit fab19fe
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/core/util/hive/kernelcr.go b/pkg/core/util/hive/kernelcr.go
@@ -136,7 +136,7 @@ func (pH *PluginHandler) DynamicReloader(driverConfig *config.DriverConfig) {
 						}
 						if valid {
 							for s, sPh := range *pH.Services {
-								if sPh.ConfigContext != nil && *sPh.ConfigContext.CmdSenderChan != nil {
+								if sPh != nil && sPh.ConfigContext != nil && (*sPh.ConfigContext).CmdSenderChan != nil {
 									*sPh.ConfigContext.CmdSenderChan <- core.KernelCmd{
 										PluginName: sPh.Name,
 										Command:    core.PLUGIN_EVENT_STOP,
@@ -175,7 +175,7 @@ func (pH *PluginHandler) DynamicReloader(driverConfig *config.DriverConfig) {
 				if new_sha, ok := certifyMap["trcsha256"]; ok && new_sha.(string) != servPh.Signature {
 					driverConfig.CoreConfig.Log.Printf("Kernel shutdown, installing new service: %s\n", service)
 					for s, sPh := range *pH.Services {
-						if sPh.ConfigContext != nil && *sPh.ConfigContext.CmdSenderChan != nil {
+						if sPh != nil && sPh.ConfigContext != nil && (*sPh.ConfigContext).CmdSenderChan != nil {
 							*sPh.ConfigContext.CmdSenderChan <- core.KernelCmd{
 								PluginName: sPh.Name,
 								Command:    core.PLUGIN_EVENT_STOP,
@@ -188,7 +188,7 @@ func (pH *PluginHandler) DynamicReloader(driverConfig *config.DriverConfig) {
 					}
 
 					if t, ok := certifyMap["trctype"]; ok && t.(string) == "trcshkubeservice" {
-						if servPh.ConfigContext == nil || *servPh.ConfigContext.CmdSenderChan == nil {
+						if servPh != nil && servPh.ConfigContext == nil || (*servPh.ConfigContext).CmdSenderChan == nil {
 							driverConfig.CoreConfig.Log.Printf("Kube service not properly initialized to shut down: %s\n", service)
 							goto waitToReload
 						}