Do not segfault on hard stop

rhatdan · rhatdan · commit 4f02e65557f5 · 2024-08-19T09:34:57.000-04:00
Podman machine on MAC can segfault on hard stop.

Fixes: 23654

Signed-off-by: Daniel J Walsh &lt;dwalsh@redhat.com&gt;
diff --git a/pkg/machine/apple/vfkit/helper.go b/pkg/machine/apple/vfkit/helper.go
@@ -83,8 +83,10 @@ func (vf *Helper) stateChange(newState rest.StateChange) error {
 	}
 	payload := bytes.NewReader(b)
 	serverResponse, err := vf.post(vf.Endpoint+state, payload)
-	_ = serverResponse.Body.Close()
-	return err
+	if err != nil {
+		return err
+	}
+	return serverResponse.Body.Close()
 }
 
 func (vf *Helper) Stop(force, wait bool) error {

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,10 @@ func (vf *Helper) stateChange(newState rest.StateChange) error {`
`83`	`83`	`}`
`84`	`84`	`payload := bytes.NewReader(b)`
`85`	`85`	`serverResponse, err := vf.post(vf.Endpoint+state, payload)`
`86`		`- _ = serverResponse.Body.Close()`
`87`		`- return err`
	`86`	`+ if err != nil {`
	`87`	`+ return err`
	`88`	`+ }`
	`89`	`+ return serverResponse.Body.Close()`
`88`	`90`	`}`
`89`	`91`
`90`	`92`	`func (vf *Helper) Stop(force, wait bool) error {`