aboutsummaryrefslogtreecommitdiff
path: root/matrix
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2019-06-16 21:24:51 +0300
committerTulir Asokan <tulir@maunium.net>2019-06-16 21:24:51 +0300
commitc6ca343cd1b198c6a15f8d3045bc7e83b1a36cf3 (patch)
tree763664bd39146a97a9b301535a38d434e661843e /matrix
parentd1d129f6cffb909516a29f9bdb0da6f13e65dcaf (diff)
Fix panic in redaction handling
Diffstat (limited to 'matrix')
-rw-r--r--matrix/history.go2
-rw-r--r--matrix/matrix.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/matrix/history.go b/matrix/history.go
index af81ed2..bcec304 100644
--- a/matrix/history.go
+++ b/matrix/history.go
@@ -123,7 +123,7 @@ func (hm *HistoryManager) Update(room *rooms.Room, eventID string, update func(e
}
stream := tx.Bucket(bucketRoomStreams).Bucket(rid)
eventData := stream.Get(streamIndex)
- if eventData == nil {
+ if eventData == nil || len(eventData) == 0 {
return EventNotFoundError
}
diff --git a/matrix/matrix.go b/matrix/matrix.go
index 9178ca0..6c2809c 100644
--- a/matrix/matrix.go
+++ b/matrix/matrix.go
@@ -321,7 +321,7 @@ func (c *Container) HandleRedaction(source EventSource, evt *mautrix.Event) {
debug.Print("Failed to mark", evt.Redacts, "as redacted:", err)
}
- if !room.Loaded() {
+ if !room.Loaded() || redactedEvt == nil {
return
}