[executor] Prevent crash on nil RPC connection

teo · teo · commit d44aceae5d98 · 2023-10-06T12:08:20.000+02:00
diff --git a/executor/executorcmd/client.go b/executor/executorcmd/client.go
@@ -127,7 +127,10 @@ type RpcClient struct {
 }
 
 func (r *RpcClient) Close() error {
-	return r.conn.Close()
+	if r != nil && r.conn != nil {
+		return r.conn.Close()
+	}
+	return nil
 }
 
 func (r *RpcClient) FromDeviceState(state string) string {

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,10 @@ type RpcClient struct {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`func (r *RpcClient) Close() error {`
`130`		`- return r.conn.Close()`
	`130`	`+ if r != nil && r.conn != nil {`
	`131`	`+ return r.conn.Close()`
	`132`	`+ }`
	`133`	`+ return nil`
`131`	`134`	`}`
`132`	`135`
`133`	`136`	`func (r *RpcClient) FromDeviceState(state string) string {`