CSGOWTF/csgowtfd
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fixed unmarshalling into nil-pointer

Browse Source
This commit is contained in:
Giovanni Harting
2022-11-28 12:53:04 +01:00
parent 1ac07c2f5a
commit c6ddf14a26
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
csgo/demo_loader.go
View File

@@ -105,7 +105,7 @@ func (dml *DemoMatchLoader) lockDemo(demo *Demo) {
func (dml *DemoMatchLoader) HandleGCPacket(pkg *gamecoordinator.GCPacket) { func (dml *DemoMatchLoader) HandleGCPacket(pkg *gamecoordinator.GCPacket) {
switch pkg.MsgType { switch pkg.MsgType {
case uint32(protobuf.EGCBaseClientMsg_k_EMsgGCClientWelcome): case uint32(protobuf.EGCBaseClientMsg_k_EMsgGCClientWelcome):
var msg *protobuf.CMsgClientWelcome msg := &protobuf.CMsgClientWelcome{}
err := proto.Unmarshal(pkg.Body, msg) err := proto.Unmarshal(pkg.Body, msg)
if err != nil { if err != nil {
log.Errorf("[DL] Unable to unmarshal event %v: %v", pkg.MsgType, err) 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) log.Debugf("[GC] Welcome: %+v", msg)
dml.GCReady = true dml.GCReady = true
case uint32(protobuf.EGCBaseClientMsg_k_EMsgGCClientConnectionStatus): case uint32(protobuf.EGCBaseClientMsg_k_EMsgGCClientConnectionStatus):
var msg *protobuf.CMsgConnectionStatus msg := &protobuf.CMsgConnectionStatus{}
err := proto.Unmarshal(pkg.Body, msg) err := proto.Unmarshal(pkg.Body, msg)
if err != nil { if err != nil {
log.Errorf("[GC] Unable to unmarshal event %v: %v", pkg.MsgType, err) 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() go dml.greetGC()
} }
case uint32(protobuf.ECsgoGCMsg_k_EMsgGCCStrike15_v2_GC2ClientGlobalStats): case uint32(protobuf.ECsgoGCMsg_k_EMsgGCCStrike15_v2_GC2ClientGlobalStats):
var msg *protobuf.GlobalStatistics msg := &protobuf.GlobalStatistics{}
err := proto.Unmarshal(pkg.Body, msg) err := proto.Unmarshal(pkg.Body, msg)
if err != nil { if err != nil {
log.Errorf("[GC] Unable to unmarshal event %v: %v", pkg.MsgType, err) 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) log.Debugf("[GC] Stats: %+v", msg)
dml.GCReady = true dml.GCReady = true
case uint32(protobuf.ECsgoGCMsg_k_EMsgGCCStrike15_v2_MatchList): case uint32(protobuf.ECsgoGCMsg_k_EMsgGCCStrike15_v2_MatchList):
var msg *protobuf.CMsgGCCStrike15V2_MatchList msg := &protobuf.CMsgGCCStrike15V2_MatchList{}
err := proto.Unmarshal(pkg.Body, msg) err := proto.Unmarshal(pkg.Body, msg)
if err != nil { if err != nil {
log.Errorf("[GC] Unable to unmarshal event %v: %v", pkg.MsgType, err) log.Errorf("[GC] Unable to unmarshal event %v: %v", pkg.MsgType, err)