Avoiding nil pointer in podmanFactory.CanHandleAndAccept()

iwankgb · Creatone · commit b46650d0fdeb · 2024-07-09T16:07:57.000+02:00
diff --git a/container/podman/factory.go b/container/podman/factory.go
@@ -91,10 +91,12 @@ func (f *podmanFactory) CanHandleAndAccept(name string) (handle bool, accept boo
 	id := dockerutil.ContainerNameToId(name)
 
 	ctnr, err := InspectContainer(id)
-	if err != nil || !ctnr.State.Running {
+	if err != nil {
 		return false, true, fmt.Errorf("error inspecting container: %v", err)
 	}
-
+	if 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
`@@ -91,10 +91,12 @@ func (f *podmanFactory) CanHandleAndAccept(name string) (handle bool, accept boo`
`91`	`91`	`id := dockerutil.ContainerNameToId(name)`
`92`	`92`
`93`	`93`	`ctnr, err := InspectContainer(id)`
`94`		`- if err != nil \|\| !ctnr.State.Running {`
	`94`	`+ if err != nil {`
`95`	`95`	`return false, true, fmt.Errorf("error inspecting container: %v", err)`
`96`	`96`	`}`
`97`		`-`
	`97`	`+ if ctnr.State == nil \|\| !ctnr.State.Running {`
	`98`	`+ return false, true, fmt.Errorf("container not running")`
	`99`	`+ }`
`98`	`100`	`return true, true, nil`
`99`	`101`	`}`
`100`	`102`