fix: secure crash when end Index is higher than length

wireapp · Sep 1, 2023 · 69fda14 · 69fda14
1 parent af949b1
commit 69fda14
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/HighLightName.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/HighLightName.kt
@@ -79,12 +79,14 @@ fun HighlightName(
                 }
 
                 highlightIndexes
-                    .forEach { highLightIndexes ->
-                        addStyle(
-                            style = SpanStyle(background = MaterialTheme.wireColorScheme.highLight.copy(alpha = 0.5f)),
-                            start = highLightIndexes.startIndex,
-                            end = highLightIndexes.endIndex
-                        )
+                    .forEach { highLightIndex ->
+                        if (highLightIndex.endIndex < this.length) {
+                            addStyle(
+                                style = SpanStyle(background = MaterialTheme.wireColorScheme.highLight.copy(alpha = 0.5f)),
+                                start = highLightIndex.startIndex,
+                                end = highLightIndex.endIndex
+                            )
+                        }
                     }
             },
             maxLines = 1,

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/HighLightSubtTitle.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/HighLightSubtTitle.kt
@@ -80,13 +80,15 @@ fun HighlightSubtitle(
 
                 highlightIndexes
                     .forEach { highLightIndex ->
-                        addStyle(
-                            style = SpanStyle(
-                                background = MaterialTheme.wireColorScheme.highLight.copy(alpha = 0.5f),
-                            ),
-                            start = highLightIndex.startIndex + suffix.length,
-                            end = highLightIndex.endIndex + suffix.length
-                        )
+                        if (highLightIndex.endIndex < this.length) {
+                            addStyle(
+                                style = SpanStyle(
+                                    background = MaterialTheme.wireColorScheme.highLight.copy(alpha = 0.5f),
+                                ),
+                                start = highLightIndex.startIndex + suffix.length,
+                                end = highLightIndex.endIndex + suffix.length
+                            )
+                        }
                     }
             },
             maxLines = 1,