From 0798b0c50ab02a5e1def47ab55d6747e870e092c Mon Sep 17 00:00:00 2001 From: Iiro Laiho Date: Fri, 9 Dec 2022 15:52:11 +0200 Subject: [PATCH] Fix null pointer runtime panic (whatsapp) --- bridge/whatsappmulti/handlers.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bridge/whatsappmulti/handlers.go b/bridge/whatsappmulti/handlers.go index 4f38a032..72ac781d 100644 --- a/bridge/whatsappmulti/handlers.go +++ b/bridge/whatsappmulti/handlers.go @@ -62,7 +62,7 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto. } var text string - var parent string + var parent string = "" // nolint:nestif if msg.GetExtendedTextMessage() == nil { @@ -130,8 +130,8 @@ func (b *Bwhatsapp) handleImageMessage(msg *events.Message) { senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } - var parent string - if ci.StanzaId != nil { + var parent string = "" + if ci != nil && ci.StanzaId != nil { parent = *ci.StanzaId } @@ -199,8 +199,8 @@ func (b *Bwhatsapp) handleVideoMessage(msg *events.Message) { senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } - var parent string - if ci.StanzaId != nil { + var parent string = "" + if ci != nil && ci.StanzaId != nil { parent = *ci.StanzaId } @@ -262,8 +262,8 @@ func (b *Bwhatsapp) handleAudioMessage(msg *events.Message) { senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } - var parent string - if ci.StanzaId != nil { + var parent string = "" + if ci != nil && ci.StanzaId != nil { parent = *ci.StanzaId } @@ -325,8 +325,8 @@ func (b *Bwhatsapp) handleDocumentMessage(msg *events.Message) { senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } - var parent string - if ci.StanzaId != nil { + var parent string = "" + if ci != nil && ci.StanzaId != nil { parent = *ci.StanzaId }