Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when processing invalid mentions.

Browse Source
This commit is contained in:
Cody Henthorne
2021-05-19 13:15:28 -04:00
parent f490d1f6d2
commit 6770d21cf7
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/database/MentionUtil.java
View File

@@ -76,6 +76,10 @@ public final class MentionUtil {
int bodyIndex = 0;
for (Mention mention : sortedMentions) {
if (invalidMention(body, mention)) {
return new UpdatedBodyAndMentions(body, Collections.emptyList());
}
updatedBody.append(body.subSequence(bodyIndex, mention.getStart()));
CharSequence replaceWith = replacementTextGenerator.apply(mention);
Mention updatedMention = new Mention(mention.getRecipientId(), updatedBody.length(), replaceWith.length());
@@ -139,6 +143,13 @@ public final class MentionUtil {
throw new IllegalArgumentException("Unknown mention setting: " + mentionSetting);
}
private static boolean invalidMention(@NonNull CharSequence body, @NonNull Mention mention) {
int start = mention.getStart();
int length = mention.getLength();
return start < 0 || length < 0 || (start + length) > body.length();
}
public static class UpdatedBodyAndMentions {
@Nullable private final CharSequence body;
@NonNull private final List<Mention> mentions;

2
app/src/test/java/org/thoughtcrime/securesms/database/MentionUtilTest_updateBodyAndMentionsWithPlaceholders.java
View File

@@ -69,6 +69,8 @@ public class MentionUtilTest_updateBodyAndMentionsWithPlaceholders {
builder().text("middle 🤡👍🏾 👨🏼‍🤝‍👨🏽 ").mention("a").text(" 👍🏾 middle 👩‍👩‍👦‍👦").build(),
builder().text("start ").mention("emoji 🩳").build(),
builder().text("start ").mention("emoji 🩳").text(" middle ").mention("emoji 🩳").text(" end").build(),
{ "message", Collections.singletonList(new Mention(RecipientId.from(1), 30, 5)), "message", Collections.<Mention>emptyList() }
});
}