Merge pull request #5062 from openshift-cherrypick-robot/cherry-pick-5060-to-release-1.21

openshift-merge-robot · web-flow · commit 8d2015333c7d · 2021-07-08T17:07:08.000-04:00
[release-1.21] server: prevent segfault by not using a potentially nil sandbox
diff --git a/server/sandbox_stop.go b/server/sandbox_stop.go
@@ -20,7 +20,7 @@ func (s *Server) StopPodSandbox(ctx context.Context, req *types.StopPodSandboxRe
 			return err
 		}
 		if err == errSandboxNotCreated {
-			return fmt.Errorf("StopPodSandbox failed as the sandbox is not created: %s", sb.ID())
+			return fmt.Errorf("StopPodSandbox failed as the sandbox is not created: %s", req.PodSandboxID)
 		}
 
 		// If the sandbox isn't found we just return an empty response to adhere

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func (s Server) StopPodSandbox(ctx context.Context, req types.StopPodSandboxRe`
`20`	`20`	`return err`
`21`	`21`	`}`
`22`	`22`	`if err == errSandboxNotCreated {`
`23`		`- return fmt.Errorf("StopPodSandbox failed as the sandbox is not created: %s", sb.ID())`
	`23`	`+ return fmt.Errorf("StopPodSandbox failed as the sandbox is not created: %s", req.PodSandboxID)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// If the sandbox isn't found we just return an empty response to adhere`