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

Merge "RESTRICT AUTOMERGE Revive runLimit check logic" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-17 02:33:30 +00:00
committed by Android (Google) Code Review
parent 37c65a3e5c fd1a7e8663
commit d7f6ede261
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/text/TextLine.java
View File

@@ -257,6 +257,9 @@ public class TextLine {
for (int i = 0; i < runs.length; i += 2) { for (int i = 0; i < runs.length; i += 2) {
int runStart = runs[i]; int runStart = runs[i];
int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK); int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);
if (runLimit > mLen) {
runLimit = mLen;
}
if (runStart > mLen) break; if (runStart > mLen) break;
boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;
@@ -333,6 +336,9 @@ public class TextLine {
for (int i = 0; i < runs.length; i += 2) { for (int i = 0; i < runs.length; i += 2) {
int runStart = runs[i]; int runStart = runs[i];
int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK); int runLimit = runStart + (runs[i+1] & Layout.RUN_LENGTH_MASK);
if (runLimit > mLen) {
runLimit = mLen;
}
if (runStart > mLen) break; if (runStart > mLen) break;
boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i+1] & Layout.RUN_RTL_FLAG) != 0;
@@ -420,6 +426,9 @@ public class TextLine {
for (int i = 0; i < runs.length; i += 2) { for (int i = 0; i < runs.length; i += 2) {
int runStart = runs[i]; int runStart = runs[i];
int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK); int runLimit = runStart + (runs[i + 1] & Layout.RUN_LENGTH_MASK);
if (runLimit > mLen) {
runLimit = mLen;
}
if (runStart > mLen) break; if (runStart > mLen) break;
boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0; boolean runIsRtl = (runs[i + 1] & Layout.RUN_RTL_FLAG) != 0;