mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Check that db actually returned json blob for requested nid

Browse source
This commit is contained in:
Devon Hudson 2023-01-17 15:50:25 -07:00
parent d440223e04
commit 7c692e7eda
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
relayapi/storage/shared/storage.go
View file

@ -116,6 +116,7 @@ func (d *Database) GetTransaction(
if len(nids) == 0 { if len(nids) == 0 {
return nil, nil, nil return nil, nil, nil
} }
firstNID := nids[0]
txns := map[int64][]byte{} txns := map[int64][]byte{}
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
@ -127,12 +128,16 @@ func (d *Database) GetTransaction(
} }
transaction := &gomatrixserverlib.Transaction{} transaction := &gomatrixserverlib.Transaction{}
err = json.Unmarshal(txns[nids[0]], transaction) if _, ok := txns[firstNID]; !ok {
return nil, nil, fmt.Errorf("Failed retrieving json blob for transaction: %d", firstNID)
}
err = json.Unmarshal(txns[firstNID], transaction)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("Unmarshal transaction: %w", err) return nil, nil, fmt.Errorf("Unmarshal transaction: %w", err)
} }
receipt := receipt.NewReceipt(nids[0]) receipt := receipt.NewReceipt(firstNID)
return transaction, &receipt, nil return transaction, &receipt, nil
} }