hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-20 18:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try assigning the map first

Browse source
This commit is contained in:
Neil Alexander 2021-07-28 16:25:29 +01:00
parent 4176595d9c
commit 946d15f976
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
keyserver/storage/postgres/cross_signing_keys_table.go
View file

@ -68,6 +68,7 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
return nil, err return nil, err
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectCrossSigningKeysForUserStmt: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectCrossSigningKeysForUserStmt: rows.close() failed")
r = api.CrossSigningKeyMap{}
for rows.Next() { for rows.Next() {
var keyType gomatrixserverlib.CrossSigningKeyPurpose var keyType gomatrixserverlib.CrossSigningKeyPurpose
var keyID gomatrixserverlib.KeyID var keyID gomatrixserverlib.KeyID

3
keyserver/storage/sqlite3/cross_signing_keys_table.go
View file

@ -68,6 +68,7 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
return nil, err return nil, err
} }
defer internal.CloseAndLogIfError(ctx, rows, "selectCrossSigningKeysForUserStmt: rows.close() failed") defer internal.CloseAndLogIfError(ctx, rows, "selectCrossSigningKeysForUserStmt: rows.close() failed")
r = api.CrossSigningKeyMap{}
for rows.Next() { for rows.Next() {
var keyType gomatrixserverlib.CrossSigningKeyPurpose var keyType gomatrixserverlib.CrossSigningKeyPurpose
var keyID gomatrixserverlib.KeyID var keyID gomatrixserverlib.KeyID
@ -75,7 +76,7 @@ func (s *crossSigningKeysStatements) SelectCrossSigningKeysForUser(
if err := rows.Scan(&keyType, &keyID, &keyData); err != nil { if err := rows.Scan(&keyType, &keyID, &keyData); err != nil {
return nil, err return nil, err
} }
r[keyType][keyID] = gomatrixserverlib.Base64Bytes{} r[keyType][keyID] = keyData
} }
return return
} }