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

sqlite: Ensure we return exactly the number of events found in the database

Browse source 
Previously we would return exactly the number of *requested* events, which
meant that several zero-initialised events would bubble through the system,
failing at JSON serialisation time.
This commit is contained in:
Kegan Dougal 2020-02-19 17:03:18 +00:00
parent 07128b8423
commit 18b0889a25
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roomserver/storage/sqlite3/storage.go
View file

@ -253,12 +253,13 @@ func (d *Database) Events(
) ([]types.Event, error) { ) ([]types.Event, error) {
var eventJSONs []eventJSONPair var eventJSONs []eventJSONPair
var err error var err error
results := make([]types.Event, len(eventNIDs)) var results []types.Event
err = common.WithTransaction(d.db, func(txn *sql.Tx) error { err = common.WithTransaction(d.db, func(txn *sql.Tx) error {
eventJSONs, err = d.statements.bulkSelectEventJSON(ctx, txn, eventNIDs) eventJSONs, err = d.statements.bulkSelectEventJSON(ctx, txn, eventNIDs)
if err != nil || len(eventJSONs) == 0 { if err != nil || len(eventJSONs) == 0 {
return nil return nil
} }
results = make([]types.Event, len(eventJSONs))
for i, eventJSON := range eventJSONs { for i, eventJSON := range eventJSONs {
result := &results[i] result := &results[i]
result.EventNID = eventJSON.EventNID result.EventNID = eventJSON.EventNID