Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle integer overflow in BaseInputConnection" into udc-dev am: 51cacb70e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22900702

Change-Id: Ic0895b15e2042414e15bc442bde5b95f5627855c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-09 16:19:47 +00:00
committed by Automerger Merge Worker
parent c61016736f 51cacb70e6
commit d37c382e2a
2 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/view/inputmethod/BaseInputConnection.java
View File

@@ -622,15 +622,11 @@ public class BaseInputConnection implements InputConnection {
if (b < 0) {
b = 0;
}
if (b + length > content.length()) {
length = content.length() - b;
}
int end = (int) Math.min((long) b + length, content.length());
if ((flags&GET_TEXT_WITH_STYLES) != 0) {
return content.subSequence(b, b + length);
return content.subSequence(b, end);
}
return TextUtils.substring(content, b, b + length);
return TextUtils.substring(content, b, end);
}
/**
@@ -666,13 +662,9 @@ public class BaseInputConnection implements InputConnection {
selEnd = tmp;
}
int contentLength = content.length();
int startPos = selStart - beforeLength;
int endPos = selEnd + afterLength;
// Guards the start and end pos within range [0, contentLength].
startPos = Math.max(0, startPos);
endPos = Math.min(contentLength, endPos);
int startPos = Math.max(0, selStart - beforeLength);
int endPos = (int) Math.min((long) selEnd + afterLength, content.length());
CharSequence surroundingText;
if ((flags & GET_TEXT_WITH_STYLES) != 0) {

47
core/tests/coretests/src/android/view/inputmethod/BaseInputConnectionTest.java
View File

@@ -549,6 +549,14 @@ public class BaseInputConnectionTest {
.isEqualTo(new SurroundingText("456", 0, 3, -1)))
.isTrue();
verifyContentEquals(mBaseInputConnection.getTextBeforeCursor(Integer.MAX_VALUE, 0), "123");
verifyContentEquals(mBaseInputConnection.getTextAfterCursor(Integer.MAX_VALUE, 0), "789");
assertThat(
mBaseInputConnection
.getSurroundingText(Integer.MAX_VALUE, Integer.MAX_VALUE, 0)
.isEqualTo(new SurroundingText("123456789", 3, 6, -1)))
.isTrue();
int cursorCapsMode =
TextUtils.getCapsMode(
"123456789",
@@ -617,6 +625,45 @@ public class BaseInputConnectionTest {
verifyTextSnapshotContentEquals(mBaseInputConnection.takeSnapshot(), expectedTextSnapshot);
}
@Test
public void testGetText_emptyText() {
// ""
prepareContent("", 0, 0, -1, -1);
verifyContentEquals(mBaseInputConnection.getTextBeforeCursor(1, 0), "");
verifyContentEquals(mBaseInputConnection.getTextAfterCursor(1, 0), "");
assertThat(mBaseInputConnection.getSelectedText(0)).isNull();
// This falls back to default implementation in {@code InputConnection}, which always return
// -1 for offset.
assertThat(
mBaseInputConnection
.getSurroundingText(1, 1, 0)
.isEqualTo(new SurroundingText("", 0, 0, -1)))
.isTrue();
verifyContentEquals(mBaseInputConnection.getTextBeforeCursor(0, 0), "");
verifyContentEquals(mBaseInputConnection.getTextAfterCursor(0, 0), "");
assertThat(mBaseInputConnection.getSelectedText(0)).isNull();
// This falls back to default implementation in {@code InputConnection}, which always return
// -1 for offset.
assertThat(
mBaseInputConnection
.getSurroundingText(0, 0, 0)
.isEqualTo(new SurroundingText("", 0, 0, -1)))
.isTrue();
verifyContentEquals(mBaseInputConnection.getTextBeforeCursor(Integer.MAX_VALUE, 0), "");
verifyContentEquals(mBaseInputConnection.getTextAfterCursor(Integer.MAX_VALUE, 0), "");
assertThat(mBaseInputConnection.getSelectedText(0)).isNull();
assertThat(
mBaseInputConnection
.getSurroundingText(Integer.MAX_VALUE, Integer.MAX_VALUE, 0)
.isEqualTo(new SurroundingText("", 0, 0, -1)))
.isTrue();
}
@Test
public void testReplaceText_toEditorWithoutSelectionAndComposing() {
// before replace: "|"