From c6ddf14a266f84481aba1c3f0be72d3d4018fd01 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Mon, 28 Nov 2022 12:53:04 +0100 Subject: [PATCH] fixed unmarshalling into nil-pointer --- csgo/demo_loader.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/csgo/demo_loader.go b/csgo/demo_loader.go index ee227b3..6912760 100644 --- a/csgo/demo_loader.go +++ b/csgo/demo_loader.go @@ -105,7 +105,7 @@ func (dml *DemoMatchLoader) lockDemo(demo *Demo) { func (dml *DemoMatchLoader) HandleGCPacket(pkg *gamecoordinator.GCPacket) { switch pkg.MsgType { case uint32(protobuf.EGCBaseClientMsg_k_EMsgGCClientWelcome): - var msg *protobuf.CMsgClientWelcome + msg := &protobuf.CMsgClientWelcome{} err := proto.Unmarshal(pkg.Body, msg) if err != nil { log.Errorf("[DL] Unable to unmarshal event %v: %v", pkg.MsgType, err) @@ -113,7 +113,7 @@ func (dml *DemoMatchLoader) HandleGCPacket(pkg *gamecoordinator.GCPacket) { log.Debugf("[GC] Welcome: %+v", msg) dml.GCReady = true case uint32(protobuf.EGCBaseClientMsg_k_EMsgGCClientConnectionStatus): - var msg *protobuf.CMsgConnectionStatus + msg := &protobuf.CMsgConnectionStatus{} err := proto.Unmarshal(pkg.Body, msg) if err != nil { log.Errorf("[GC] Unable to unmarshal event %v: %v", pkg.MsgType, err) @@ -125,7 +125,7 @@ func (dml *DemoMatchLoader) HandleGCPacket(pkg *gamecoordinator.GCPacket) { go dml.greetGC() } case uint32(protobuf.ECsgoGCMsg_k_EMsgGCCStrike15_v2_GC2ClientGlobalStats): - var msg *protobuf.GlobalStatistics + msg := &protobuf.GlobalStatistics{} err := proto.Unmarshal(pkg.Body, msg) if err != nil { log.Errorf("[GC] Unable to unmarshal event %v: %v", pkg.MsgType, err) @@ -133,7 +133,7 @@ func (dml *DemoMatchLoader) HandleGCPacket(pkg *gamecoordinator.GCPacket) { log.Debugf("[GC] Stats: %+v", msg) dml.GCReady = true case uint32(protobuf.ECsgoGCMsg_k_EMsgGCCStrike15_v2_MatchList): - var msg *protobuf.CMsgGCCStrike15V2_MatchList + msg := &protobuf.CMsgGCCStrike15V2_MatchList{} err := proto.Unmarshal(pkg.Body, msg) if err != nil { log.Errorf("[GC] Unable to unmarshal event %v: %v", pkg.MsgType, err)