From e18a03793055a374b7cf36ccfb3a160c6c5d94d4 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 21 Sep 2020 15:36:41 +0100 Subject: [PATCH] Fix nil panic on caching roominfo --- roomserver/storage/shared/storage.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index ae6bf0108..8fa4c0e48 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -127,7 +127,7 @@ func (d *Database) RoomInfo(ctx context.Context, roomID string) (*types.RoomInfo return &info, nil } info, err := d.RoomsTable.SelectRoomInfo(ctx, roomID) - if err == nil { + if err == nil && info != nil { d.Cache.StoreRoomInfo(roomID, *info) } return info, err