From 0049100def73af88d5ec1e8c03d61203e97c6856 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 11 Mar 2020 17:38:02 +0000 Subject: [PATCH] Try to fix nil pointer exceptions --- appservice/consumers/roomserver.go | 1 + federationsender/consumers/roomserver.go | 1 + publicroomsapi/consumers/roomserver.go | 1 + syncapi/consumers/roomserver.go | 2 ++ 4 files changed, 5 insertions(+) diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index cebb917bb..e93d45fb2 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -100,6 +100,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { // Prepare the room event so that it has the correct field types // for the room version + output.NewRoomEvent.Event = gomatrixserverlib.Event{} if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil { log.WithFields(log.Fields{ "room_version": roomVersion, diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go index e68f0beee..f03e0b5a3 100644 --- a/federationsender/consumers/roomserver.go +++ b/federationsender/consumers/roomserver.go @@ -93,6 +93,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { // Prepare the room event so that it has the correct field types // for the room version + output.NewRoomEvent.Event = gomatrixserverlib.Event{} if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil { log.WithFields(log.Fields{ "room_version": roomVersion, diff --git a/publicroomsapi/consumers/roomserver.go b/publicroomsapi/consumers/roomserver.go index 099c1337e..a2ec1d92c 100644 --- a/publicroomsapi/consumers/roomserver.go +++ b/publicroomsapi/consumers/roomserver.go @@ -83,6 +83,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { // Prepare the room event so that it has the correct field types // for the room version + output.NewRoomEvent.Event = gomatrixserverlib.Event{} if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil { log.WithFields(log.Fields{ "room_version": roomVersion, diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index 8184d1bcc..32eaf6e2d 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -93,6 +93,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { switch output.Type { case api.OutputTypeNewRoomEvent: + output.NewRoomEvent.Event = gomatrixserverlib.Event{} if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil { log.WithFields(log.Fields{ "room_version": roomVersion, @@ -106,6 +107,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { } return s.onNewRoomEvent(context.TODO(), *output.NewRoomEvent) case api.OutputTypeNewInviteEvent: + output.NewInviteEvent.Event = gomatrixserverlib.Event{} if err := output.NewInviteEvent.Event.PrepareAs(roomVersion); err != nil { log.WithFields(log.Fields{ "room_version": roomVersion,