From 17cc23364d0730acdf4dc84e9efdb63bfdd90155 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 26 Jun 2021 20:54:17 -0500 Subject: [PATCH] Make sure we don't use negative oftsets when finding an index. Fixes #3204 --- .../Sources/Account/FeedProvider/Twitter/TwitterStatus.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift b/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift index 149814667..0e86168fb 100644 --- a/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift +++ b/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift @@ -91,8 +91,8 @@ private extension TwitterStatus { } } - let offsetStartIndex = entity.startIndex - unicodeScalarOffset - let offsetEndIndex = entity.endIndex - unicodeScalarOffset + let offsetStartIndex = unicodeScalarOffset < entity.startIndex ? entity.startIndex - unicodeScalarOffset : entity.startIndex + let offsetEndIndex = unicodeScalarOffset < entity.endIndex ? entity.endIndex - unicodeScalarOffset : entity.endIndex let entityStartIndex = text.index(text.startIndex, offsetBy: offsetStartIndex, limitedBy: text.endIndex) ?? text.startIndex let entityEndIndex = text.index(text.startIndex, offsetBy: offsetEndIndex, limitedBy: text.endIndex) ?? text.endIndex