Merge pull request #3566 from char8/char8/fix-podman-inspect-crash

iwankgb · web-flow · commit c15f44e578c7 · 2024-08-07T23:14:43.000+02:00
address another nil ptr check in podmanFactory.CanHandleAndAccept()
diff --git a/container/podman/factory.go b/container/podman/factory.go
@@ -94,7 +94,7 @@ func (f *podmanFactory) CanHandleAndAccept(name string) (handle bool, accept boo
 	if err != nil {
 		return false, true, fmt.Errorf("error inspecting container: %v", err)
 	}
-	if ctnr.State == nil || !ctnr.State.Running {
+	if ctnr.ContainerJSONBase == nil || ctnr.State == nil || !ctnr.State.Running {
 		return false, true, fmt.Errorf("container not running")
 	}
 	return true, true, nil

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func (f *podmanFactory) CanHandleAndAccept(name string) (handle bool, accept boo`
`94`	`94`	`if err != nil {`
`95`	`95`	`return false, true, fmt.Errorf("error inspecting container: %v", err)`
`96`	`96`	`}`
`97`		`- if ctnr.State == nil \|\| !ctnr.State.Running {`
	`97`	`+ if ctnr.ContainerJSONBase == nil \|\| ctnr.State == nil \|\| !ctnr.State.Running {`
`98`	`98`	`return false, true, fmt.Errorf("container not running")`
`99`	`99`	`}`
`100`	`100`	`return true, true, nil`