Add checks for mention offsets

mautrix · Mar 10, 2024 · ad96a68 · ad96a68
1 parent c4157b6
commit ad96a68
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/msgconv/mentions.go b/msgconv/mentions.go
@@ -58,8 +58,14 @@ func (mc *MessageConverter) metaToMatrixText(ctx context.Context, text string, r
 		if mention.Offset < prevEnd {
 			zerolog.Ctx(ctx).Warn().Msg("Ignoring overlapping mentions in message")
 			continue
+		} else if mention.Offset >= len(utf16Text) {
+			zerolog.Ctx(ctx).Warn().Msg("Ignoring mention outside of message")
+			continue
 		}
 		end := mention.Offset + mention.Length
+		if end > len(utf16Text) {
+			end = len(utf16Text)
+		}
 		var mentionLink string
 		switch mention.Type {
 		case socket.MentionTypePerson: