[skip-changelog] Fixed nil pointer exception (#1733)

cmaglie · web-flow · commit 6883b39a443f · 2022-05-12T17:33:40.000+02:00
diff --git a/commands/instances.go b/commands/instances.go
@@ -176,7 +176,11 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 	if responseCallback == nil {
 		responseCallback = func(r *rpc.InitResponse) {}
 	}
-	instance := instances[req.Instance.Id]
+	reqInst := req.GetInstance()
+	if reqInst == nil {
+		return &arduino.InvalidInstanceError{}
+	}
+	instance := instances[reqInst.GetId()]
 	if instance == nil {
 		return &arduino.InvalidInstanceError{}
 	}

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,11 @@ func Init(req rpc.InitRequest, responseCallback func(r rpc.InitResponse)) erro`
`176`	`176`	`if responseCallback == nil {`
`177`	`177`	`responseCallback = func(r *rpc.InitResponse) {}`
`178`	`178`	`}`
`179`		`- instance := instances[req.Instance.Id]`
	`179`	`+ reqInst := req.GetInstance()`
	`180`	`+ if reqInst == nil {`
	`181`	`+ return &arduino.InvalidInstanceError{}`
	`182`	`+ }`
	`183`	`+ instance := instances[reqInst.GetId()]`
`180`	`184`	`if instance == nil {`
`181`	`185`	`return &arduino.InvalidInstanceError{}`
`182`	`186`	`}`