mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 20:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix nil pointer exceptions

Browse source
This commit is contained in:
Neil Alexander 2020-03-11 17:38:02 +00:00
parent 61dffdacf0
commit 0049100def
4 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
appservice/consumers/roomserver.go
View file

@ -100,6 +100,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
// Prepare the room event so that it has the correct field types // Prepare the room event so that it has the correct field types
// for the room version // for the room version
output.NewRoomEvent.Event = gomatrixserverlib.Event{}
if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil { if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"room_version": roomVersion, "room_version": roomVersion,

1
federationsender/consumers/roomserver.go
View file

@ -93,6 +93,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
// Prepare the room event so that it has the correct field types // Prepare the room event so that it has the correct field types
// for the room version // for the room version
output.NewRoomEvent.Event = gomatrixserverlib.Event{}
if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil { if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"room_version": roomVersion, "room_version": roomVersion,

1
publicroomsapi/consumers/roomserver.go
View file

@ -83,6 +83,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
// Prepare the room event so that it has the correct field types // Prepare the room event so that it has the correct field types
// for the room version // for the room version
output.NewRoomEvent.Event = gomatrixserverlib.Event{}
if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil { if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"room_version": roomVersion, "room_version": roomVersion,

2
syncapi/consumers/roomserver.go
View file

@ -93,6 +93,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
switch output.Type { switch output.Type {
case api.OutputTypeNewRoomEvent: case api.OutputTypeNewRoomEvent:
output.NewRoomEvent.Event = gomatrixserverlib.Event{}
if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil { if err := output.NewRoomEvent.Event.PrepareAs(roomVersion); err != nil {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"room_version": roomVersion, "room_version": roomVersion,
@ -106,6 +107,7 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
} }
return s.onNewRoomEvent(context.TODO(), *output.NewRoomEvent) return s.onNewRoomEvent(context.TODO(), *output.NewRoomEvent)
case api.OutputTypeNewInviteEvent: case api.OutputTypeNewInviteEvent:
output.NewInviteEvent.Event = gomatrixserverlib.Event{}
if err := output.NewInviteEvent.Event.PrepareAs(roomVersion); err != nil { if err := output.NewInviteEvent.Event.PrepareAs(roomVersion); err != nil {
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"room_version": roomVersion, "room_version": roomVersion,