Skip to content

Commit 82df90c

Browse files
elijahstormaybabtme
authored andcommitted
pre-check for null leg
1 parent cb15055 commit 82df90c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

internal/localsvc/svc.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,14 +286,16 @@ func (svc *Service) WatchQuery(ctx context.Context, req *connect.Request[qrv1.Wa
286286
case leg := <-legc:
287287
// try to append to an existing LEG first
288288
for _, eleg := range legs {
289-
if eleg.MachineId == leg.MachineId &&
289+
if eleg != nil && leg != nil && eleg.MachineId == leg.MachineId &&
290290
eleg.SessionId == leg.SessionId {
291291
eleg.Logs = append(eleg.Logs, leg.Logs...)
292292
continue wait_for_more_leg
293293
}
294294
}
295295
// didn't have an existing LEG for it, add it
296-
legs = append(legs, leg)
296+
if leg != nil {
297+
legs = append(legs, leg)
298+
}
297299
case <-sender.C:
298300
err := stream.Send(&qrv1.WatchQueryResponse{
299301
Events: legs,

0 commit comments

Comments
 (0)