Merge pull request #5708 from dymurray/panic110

Prevent nil panic on exec restore hooks (#5675)
vmware-tanzu · Jan 3, 2023 · 57ffffc · 57ffffc
2 parents b73914d + 8bee9c9
commit 57ffffc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/changelogs/unreleased/5708-dymurray b/changelogs/unreleased/5708-dymurray
@@ -0,0 +1 @@
+Prevent nil panic on exec restore hooks
diff --git a/pkg/controller/restore_controller.go b/pkg/controller/restore_controller.go
@@ -342,10 +342,12 @@ func (c *restoreController) validateAndComplete(restore *api.Restore, pluginMana
 	}
 	for _, resource := range restoreHooks {
 		for _, h := range resource.RestoreHooks {
-			for _, container := range h.Init.InitContainers {
-				err = hook.ValidateContainer(container.Raw)
-				if err != nil {
-					restore.Status.ValidationErrors = append(restore.Status.ValidationErrors, err.Error())
+			if h.Init != nil {
+				for _, container := range h.Init.InitContainers {
+					err = hook.ValidateContainer(container.Raw)
+					if err != nil {
+						restore.Status.ValidationErrors = append(restore.Status.ValidationErrors, err.Error())
+					}
 				}
 			}
 		}