Skip to content

Commit 95b430d

Browse files
committed
fix: NPE when no trace data given
1 parent 71b5295 commit 95b430d

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

beacon-chain/sync/rpc.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,12 @@ func (s *Service) registerRPC(baseTopic string, handle rpcHandler) {
251251
s.cfg.p2p.Peers().Scorers().BadResponsesScorer().Increment(stream.Conn().RemotePeer())
252252
return
253253
}
254+
254255
traceData, err := handle(ctx, msg, stream)
256+
if traceData == nil {
257+
traceData = map[string]any{}
258+
}
259+
255260
if err != nil {
256261
traceData["Error"] = err.Error()
257262
} else {
@@ -279,6 +284,10 @@ func (s *Service) registerRPC(baseTopic string, handle rpcHandler) {
279284
return
280285
}
281286
traceData, err := handle(ctx, nTyp.Elem().Interface(), stream)
287+
if traceData == nil {
288+
traceData = map[string]any{}
289+
}
290+
282291
if err != nil {
283292
traceData["Error"] = err.Error()
284293
} else {

0 commit comments

Comments
 (0)