lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix null pointer runtime panic (whatsapp)

Browse Source
This commit is contained in:
Iiro Laiho
2022-12-09 15:52:11 +02:00
parent 6afa93e537
commit 0798b0c50a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bridge/whatsappmulti/handlers.go
View File

@@ -62,7 +62,7 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
} }
var text string var text string
var parent string var parent string = ""
// nolint:nestif // nolint:nestif
if msg.GetExtendedTextMessage() == nil { if msg.GetExtendedTextMessage() == nil {
@@ -130,8 +130,8 @@ func (b *Bwhatsapp) handleImageMessage(msg *events.Message) {
senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer)
} }
var parent string var parent string = ""
if ci.StanzaId != nil { if ci != nil && ci.StanzaId != nil {
parent = *ci.StanzaId parent = *ci.StanzaId
} }
@@ -199,8 +199,8 @@ func (b *Bwhatsapp) handleVideoMessage(msg *events.Message) {
senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer)
} }
var parent string var parent string = ""
if ci.StanzaId != nil { if ci != nil && ci.StanzaId != nil {
parent = *ci.StanzaId parent = *ci.StanzaId
} }
@@ -262,8 +262,8 @@ func (b *Bwhatsapp) handleAudioMessage(msg *events.Message) {
senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer)
} }
var parent string var parent string = ""
if ci.StanzaId != nil { if ci != nil && ci.StanzaId != nil {
parent = *ci.StanzaId parent = *ci.StanzaId
} }
@@ -325,8 +325,8 @@ func (b *Bwhatsapp) handleDocumentMessage(msg *events.Message) {
senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer)
} }
var parent string var parent string = ""
if ci.StanzaId != nil { if ci != nil && ci.StanzaId != nil {
parent = *ci.StanzaId parent = *ci.StanzaId
} }