From 1b90cc95367947fa00616b4426d0c894b33c9862 Mon Sep 17 00:00:00 2001
From: Till <2353100+S7evinK@users.noreply.github.com>
Date: Wed, 15 Jun 2022 12:50:02 +0200
Subject: [PATCH] Fix rare panic when returning user devices over federation
 (#2534)

---
 federationapi/routing/devices.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go
index 1a092645f..2f9da1f25 100644
--- a/federationapi/routing/devices.go
+++ b/federationapi/routing/devices.go
@@ -85,6 +85,9 @@ func GetUserDevices(
 			if targetKey, ok := targetUser[gomatrixserverlib.KeyID(dev.DeviceID)]; ok {
 				for sourceUserID, forSourceUser := range targetKey {
 					for sourceKeyID, sourceKey := range forSourceUser {
+						if device.Keys.Signatures == nil {
+							device.Keys.Signatures = map[string]map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
+						}
 						if _, ok := device.Keys.Signatures[sourceUserID]; !ok {
 							device.Keys.Signatures[sourceUserID] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
 						}